Fix group hierarchy, missing current level
minor clean up