APD-792: Pagination does not work if filter is selected
Removed unused code
Merge branch 'APD-792-BOZ' into develop