Added pagination and search engine