Added components for search and paging