add group role to ul +cleanup

fixes bug 23084