Enhance query block for groupable properties