diff --git a/Havit.Blazor.Documentation/Model/MemberModel.cs b/Havit.Blazor.Documentation/Model/MemberModel.cs
index ef61222a..be810b5e 100644
--- a/Havit.Blazor.Documentation/Model/MemberModel.cs
+++ b/Havit.Blazor.Documentation/Model/MemberModel.cs
@@ -101,6 +101,11 @@ private string GenerateFullLink(string[] splitLink, string fullLink)
 
 	private string HandleSupportClasses(string[] splitLink, string fullLink)
 	{
+		if (IsProperty(splitLink))
+		{
+			return null;
+		}
+
 		if (IsEnum(splitLink))
 		{
 			string internalTypeLink = ApiRenderer.GenerateLinkForInternalType(splitLink[^2], false, $"{splitLink[^2]}.{splitLink[^1]}");
@@ -165,7 +170,8 @@ private string GenerateHavitDocumentationLink(string[] splitLink)
 				}
 			}
 
-			isComponent = ApiTypeHelper.GetType(splitLink[^2])?.IsSubclassOf(typeof(ComponentBase)) ?? false;
+			var type = enclosingType ?? ApiTypeHelper.GetType(splitLink[^2]);
+			isComponent = type?.IsSubclassOf(typeof(ComponentBase)) ?? false;
 		}
 		else
 		{
diff --git a/Havit.Blazor.Documentation/Services/ApiHelper.cs b/Havit.Blazor.Documentation/Services/ApiHelper.cs
index cbf66aec..7349d741 100644
--- a/Havit.Blazor.Documentation/Services/ApiHelper.cs
+++ b/Havit.Blazor.Documentation/Services/ApiHelper.cs
@@ -71,16 +71,6 @@ public static Type GetType(string typeName)
 		}
 		catch { }
 
-		try
-		{
-			result = typeof(HxButton).Assembly.GetTypes().FirstOrDefault((t) => t.FullName.Contains(typeName));
-			if (result is not null)
-			{
-				return result;
-			}
-		}
-		catch { }
-
 		return null;
 	}
 }