diff --git a/library/Icingadb/View/CommentRenderer.php b/library/Icingadb/View/CommentRenderer.php
index 541d9866..f54ff4e8 100644
--- a/library/Icingadb/View/CommentRenderer.php
+++ b/library/Icingadb/View/CommentRenderer.php
@@ -140,23 +140,19 @@ class CommentRenderer implements ItemRenderer
     public function assembleExtendedInfo($item, HtmlDocument $info, string $layout): void
     {
         if ($item->expire_time) {
-            $info->addHtml(new HtmlElement(
-                'span',
-                null,
+            $info->addHtml(
                 FormattedString::create(
                     $this->translate("expires %s"),
                     new TimeUntil($item->expire_time->getTimestamp())
                 )
-            ));
+            );
         } else {
-            $info->addHtml(new HtmlElement(
-                'span',
-                null,
+            $info->addHtml(
                 FormattedString::create(
                     $this->translate("created %s"),
                     new TimeAgo($item->entry_time->getTimestamp())
                 )
-            ));
+            );
         }
     }
 
diff --git a/library/Icingadb/View/HostgroupGridRenderer.php b/library/Icingadb/View/HostgroupGridRenderer.php
index 55d1bd7a..04cf2a28 100644
--- a/library/Icingadb/View/HostgroupGridRenderer.php
+++ b/library/Icingadb/View/HostgroupGridRenderer.php
@@ -151,7 +151,7 @@ class HostgroupGridRenderer implements ItemRenderer
 
     public function assembleCaption($item, HtmlDocument $caption, string $layout): void
     {
-        $caption->addHtml(new HtmlElement('span', null, Text::create($item->name)));
+        $caption->addHtml(Text::create($item->name));
     }
 
     public function assembleExtendedInfo($item, HtmlDocument $info, string $layout): void
diff --git a/library/Icingadb/View/HostgroupRenderer.php b/library/Icingadb/View/HostgroupRenderer.php
index d1f02a07..d0a6c39e 100644
--- a/library/Icingadb/View/HostgroupRenderer.php
+++ b/library/Icingadb/View/HostgroupRenderer.php
@@ -64,7 +64,7 @@ class HostgroupRenderer implements ItemTableRenderer
 
     public function assembleCaption($item, HtmlDocument $caption, string $layout): void
     {
-        $caption->addHtml(new HtmlElement('span', null, Text::create($item->name)));
+        $caption->addHtml(Text::create($item->name));
     }
 
     public function assembleExtendedInfo($item, HtmlDocument $info, string $layout): void
diff --git a/library/Icingadb/View/ServicegroupGridRenderer.php b/library/Icingadb/View/ServicegroupGridRenderer.php
index 789a80ce..96a41841 100644
--- a/library/Icingadb/View/ServicegroupGridRenderer.php
+++ b/library/Icingadb/View/ServicegroupGridRenderer.php
@@ -241,7 +241,7 @@ class ServicegroupGridRenderer implements ItemRenderer
 
     public function assembleCaption($item, HtmlDocument $caption, string $layout): void
     {
-        $caption->addHtml(new HtmlElement('span', null, Text::create($item->name)));
+        $caption->addHtml(Text::create($item->name));
     }
 
     public function assembleExtendedInfo($item, HtmlDocument $info, string $layout): void
diff --git a/library/Icingadb/View/ServicegroupRenderer.php b/library/Icingadb/View/ServicegroupRenderer.php
index 392c2678..56df0e91 100644
--- a/library/Icingadb/View/ServicegroupRenderer.php
+++ b/library/Icingadb/View/ServicegroupRenderer.php
@@ -63,7 +63,7 @@ class ServicegroupRenderer implements ItemTableRenderer
 
     public function assembleCaption($item, HtmlDocument $caption, string $layout): void
     {
-        $caption->addHtml(new HtmlElement('span', null, Text::create($item->name)));
+        $caption->addHtml(Text::create($item->name));
     }
 
     public function assembleExtendedInfo($item, HtmlDocument $info, string $layout): void
diff --git a/library/Icingadb/View/UserRenderer.php b/library/Icingadb/View/UserRenderer.php
index 6eb64d3c..077739ef 100644
--- a/library/Icingadb/View/UserRenderer.php
+++ b/library/Icingadb/View/UserRenderer.php
@@ -45,7 +45,7 @@ class UserRenderer implements ItemRenderer
 
     public function assembleCaption($item, HtmlDocument $caption, string $layout): void
     {
-        $caption->addHtml(new HtmlElement('span', null, Text::create($item->name)));
+        $caption->addHtml(Text::create($item->name));
     }
 
     public function assembleExtendedInfo($item, HtmlDocument $info, string $layout): void
diff --git a/library/Icingadb/View/UsergroupRenderer.php b/library/Icingadb/View/UsergroupRenderer.php
index da29e5ac..50c7f672 100644
--- a/library/Icingadb/View/UsergroupRenderer.php
+++ b/library/Icingadb/View/UsergroupRenderer.php
@@ -45,7 +45,7 @@ class UsergroupRenderer implements ItemRenderer
 
     public function assembleCaption($item, HtmlDocument $caption, string $layout): void
     {
-        $caption->addHtml(new HtmlElement('span', null, Text::create($item->name)));
+        $caption->addHtml(Text::create($item->name));
     }
 
     public function assembleExtendedInfo($item, HtmlDocument $info, string $layout): void