grouping field and varius fixes