Merge pull request #18876 from colemanw/searchDisplay