Fixed issue with using group by with calculated properties #89, #366,
#364