I think this MR !3188 (merged) broke search, so I'm reverting it:
Before:
After:
CC @oregand @sarahgerman