Improved filter and pagination.