Fixed query principles
Monster refactorization