Added pagination helpers
Some changes in query filters and searching