Fixed expand/collapse behavior for new resource groups