Improved cql guide subquery