diff --git a/src/scripts/gendoc/doc_class.template b/src/scripts/gendoc/doc_class.template
index 92e7b5b04b..14f1f568a1 100644
--- a/src/scripts/gendoc/doc_class.template
+++ b/src/scripts/gendoc/doc_class.template
@@ -57,8 +57,8 @@ ${OBJECT_STATIC_CONTENT(obj=cls, section='description')}$
 
 <!--(for impl in cls.implements)-->
   <!--(if impl.is_property)-->
+{{anchor:${impl.short_name}$}}
 ${IMPLEMENT_FULL(impl=impl, cls=cls)}$
-\\
   <!--(end)-->
 <!--(else)-->
 No properties defined in this class.
@@ -68,8 +68,8 @@ No properties defined in this class.
 
 <!--(for impl in cls.implements)-->
   <!--(if impl.is_method)-->
+{{anchor:${impl.short_name}$}}
 ${IMPLEMENT_FULL(impl=impl, cls=cls)}$
-\\
   <!--(end)-->
 <!--(else)-->
 No methods defined in this class.
@@ -103,4 +103,6 @@ No extensions defined in this class.
     <!--(end)-->
 | ''${ev.name}$'' | ${BEST_SUMMARY(obj=ev)}$ ${OBJECT_SCOPE(obj=ev)}$ ${EVENT_TAGS}$ | ${TYPE_LINK(type=ev.type) if ev.type else 'None'}$ |
   <!--(end)-->
+<!--(else)-->
+No events defined in this class.
 <!--(end)-->
diff --git a/src/scripts/gendoc/doc_macros.include b/src/scripts/gendoc/doc_macros.include
index 507693179a..9fb07d2ea4 100644
--- a/src/scripts/gendoc/doc_macros.include
+++ b/src/scripts/gendoc/doc_macros.include
@@ -167,12 +167,9 @@ interface#!
    <!--(for n in func.class_.namespaces)-->
 :${n.lower()}$#!
    <!--(end)-->
-   <!--(if func.type == Eolian_Function_Type.METHOD)-->
-:method#!
-   <!--(else)-->
-:property#!
-   <!--(end)-->
-:${func.short_name}$|${func.short_name}$]]
+:${func.class_.short_name}$#!
+#${func.short_name}$#!
+|${func.short_name}$]]
 <!--(end)-->
 #!##############################################################################
 #!####  FUNC_SCOPE(func)  ######################################################
@@ -305,7 +302,7 @@ ${', ' if i else ''}$#!
       <!--(end)-->
    <!--(end)-->
 ) #!
-${IMPLEMENT_TAGS}$ #!
+${IMPLEMENT_TAGS(impl=impl)}$ #!
    <!--(if impl.is_method)-->
       <!--(if impl.function.method_return_type)-->
  => //${impl.function.method_return_type.short_name}$// #!