Merge pull request #20348 from colemanw/searchKitTweaks