Some more search functionality added