Merge "search: clean up some type hints in search classes"