Make pagination fire new "query submit event" (thus some refactoring) and remove unused class.