[Reviewer: Ellie] Return to CQL 2.0 and fix Homer bug