fixup! fix plan of non distributed group by queries