(Issue 696) Migrate queries to CQL3