Minor update to retain search when paging