refactored querie => query