updated search to be cleaner