Added fixes for nested groups