Fix for exception when viewing blog posts with query strings

The exception message being shown was:

The context can not load the related collection or reference for untracked entities while the 'MergeOption' is not set to 'NoTracking'. Change the 'MergeOption' to 'NoTracking' or attach the 'adx_blogpost' entity.

Framework/Microsoft.Xrm.Client/EntityExtensions.cs

@@ -749,11 +749,19 @@ private static T GetRelated<T>(
 
 		private static T GetRelatedEntity<T>(OrganizationServiceContext context, Entity entity, Relationship relationship) where T : Entity
 		{
-			if (!context.IsAttached(entity) && entity.RelatedEntities.Contains(relationship))
+			if (!context.IsAttached(entity))
 			{
 				// clear out the existing related entities
+				if (entity.RelatedEntities.Contains(relationship))
+				{
+					entity.RelatedEntities.Remove(relationship);
+				}
 
-				entity.RelatedEntities.Remove(relationship);
+				// handle entity already being attached before calling entity.GetRelatedEntity
+				if (context.GetAttachedEntities().FirstOrDefault(e => e.Id == entity.Id) is Entity attached)
+				{
+					entity = attached;
+				}
 			}
 
 			context.LoadProperty(entity, relationship);