Some search functionality added.