Refactored query___ to queryXXX