[PDT-4755] Criteria rather than CDefinition controls client side filtering, clean up CQLGenerator for get and list