Added the custom search functionality as well as pagging