Introduced pagination and support more advanced queries for admin