Fixed the search issue on the app