Remove compatibility preventing working directly on the query results