updated searching and paging