Added fancy paging and query string validations