diff --git a/assets/javascripts/discourse/templates/components/docs-topic.hbs b/assets/javascripts/discourse/templates/components/docs-topic.hbs
index 626c5e2..b22b984 100644
--- a/assets/javascripts/discourse/templates/components/docs-topic.hbs
+++ b/assets/javascripts/discourse/templates/components/docs-topic.hbs
@@ -20,4 +20,4 @@
   {{d-icon "far-comment"}} {{i18n "docs.topic.navigate_to_topic"}}
 </a>
 
-{{plugin-outlet name="after-docs-topic"}}
+{{plugin-outlet name="after-docs-topic" tagName="span" connectorTagName="div"}}
diff --git a/assets/javascripts/discourse/templates/docs-index.hbs b/assets/javascripts/discourse/templates/docs-index.hbs
index caece61..a370452 100644
--- a/assets/javascripts/discourse/templates/docs-index.hbs
+++ b/assets/javascripts/discourse/templates/docs-index.hbs
@@ -69,7 +69,7 @@
                   placeholderKey="docs.tags_filter_placeholder"
                 }}
               {{/if}}
-              {{plugin-outlet name="before-docs-tag-list" tagName="" args=(hash tags=tags updateSelectedTags=updateSelectedTags)}}
+              {{plugin-outlet name="before-docs-tag-list" tagName="" connectorTagName="div" args=(hash tags=tags updateSelectedTags=updateSelectedTags)}}
               <ul>
                 {{#each sortedTags as |tag|}}
                   <li class="docs-filter-tag-{{tag.id}}">
@@ -96,7 +96,7 @@
               <div class="result-count no-result">
                 {{i18n "search.no_results"}}
               </div>
-              {{plugin-outlet name="after-docs-empty-results"}}
+              {{plugin-outlet name="after-docs-empty-results" tagName="span" connectorTagName="div"}}
             {{else}}
               <div class="result-count">
                 {{i18n "docs.search.results" count=topicCount}}
diff --git a/assets/javascripts/discourse/templates/docs.hbs b/assets/javascripts/discourse/templates/docs.hbs
index 84518cb..2c691f2 100644
--- a/assets/javascripts/discourse/templates/docs.hbs
+++ b/assets/javascripts/discourse/templates/docs.hbs
@@ -1,6 +1,8 @@
 <div class="docs">
   {{plugin-outlet
     name="before-docs-search"
+    tagName="span"
+    connectorTagName="div"
     args=(hash
       selectCategory=(action "updateSelectedCategories")
       selectTag=(action "updateSelectedTags")