Merge pull request #21049 from colemanw/searchDisplaysRef