service smart search, #23297, fallout from #22385