Your query looks fine except for the group by