[NO ISSUE][TEST] Add CH2 queries to optimizerts