fixes
bugfixes
fix restoring grouping settings