Added resolve-query-condition to handle query conditions.