#6 Improved the search functionality more