Clear filename on New
Some grouping bugfixes