#105 Relooking of grouping fields