Update queries and switch to .cql.