refactor(query): replace usage of private function

refactor(query): replace usage of private function #26