Partially added a new query type