Trying to fix search functionality