Fixed search paging issue