work in progress - added group by fields and line after line break in templates