fix search to be cleaner