Fix to filters on security token grid

prs.desktop/Panels/Security/Global/GlobalTokenGrid.cs

@@ -191,7 +191,7 @@ namespace PRSDesktop
 
             if (!MatchFilter(filter, OVERRIDDEN_FILTERS))
             {
-                bool isoverridden = Items.Any(x => String.Equals(x.Descriptor, descriptor) && (x.Type == SecurityTokenType.Group));
+                bool isoverridden = Items.Any(x => String.Equals(x.Descriptor, descriptor) && (x.Type == SecurityTokenType.Group) && x.ID == groupid);
                 var check = (filter(OVERRIDDEN_TOKENS) && isoverridden) || (filter(DEFAULT_TOKENS) && !isoverridden);
                 if (!check)
                     return false;
@@ -218,7 +218,7 @@ namespace PRSDesktop
 
             if (!MatchFilter(filter, OVERRIDDEN_FILTERS))
             {
-                bool isoverridden = Items.Any(x => string.Equals(x.Descriptor, descriptor) && (x.Type == SecurityTokenType.User));
+                bool isoverridden = Items.Any(x => string.Equals(x.Descriptor, descriptor) && (x.Type == SecurityTokenType.User) && x.ID == userid);
                 var check = (filter(OVERRIDDEN_TOKENS) && isoverridden) || (filter(DEFAULT_TOKENS) && !isoverridden);
                 if (!check)
                     return false;