EHO-384 EVU-30  group by for derby/psql missing