improve question grouping