fixed: list, if grouped by elmenent with icons on, grouping was not correct and icons stripped from group template. Also changed so that if no group template and no manual group by selected then we use the group by element as the default group by template