Bug fix: Prevent GROUP clause double-escaping