Improved filter and pagination.
Merge pull request #1161 from Wylkon/3.4.0

Improved filter and pagination.