Improve group handling in GetObjectKey