Fixed the search function....... AGAIN