raw-query moved to raw.