Fix for multitenantcy in groups