Attempt to fix the search function