Fixing Bug with Group By breaking Expression Builder