refactor search to have paging operate on current search parameters