Bug fixes on User group-diff