JC-1753  fixed search with paging