Removed unused "find" method and improved the search query