[Analytics] Query Improvement Question