Search paging info added + clean