diff --git a/templates/partial/jsonld_article.html b/templates/partial/jsonld_article.html
index abcc32b..c4ba80e 100644
--- a/templates/partial/jsonld_article.html
+++ b/templates/partial/jsonld_article.html
@@ -1,4 +1,4 @@
-{% if not PLUGINS or 'seo' not in PLUGINS %}
+{% if not PLUGINS or 'seo' not in PLUGINS or 'pelican.plugins.seo' not in PLUGINS%}
   {% if SITELOGO %}
     {% set default_cover = SITELOGO %}
   {% else %}
diff --git a/templates/partial/neighbors.html b/templates/partial/neighbors.html
index a03a9e1..65bfada 100644
--- a/templates/partial/neighbors.html
+++ b/templates/partial/neighbors.html
@@ -1,4 +1,4 @@
-{% if PLUGINS and 'neighbors' in PLUGINS %}
+{% if PLUGINS and ('neighbors' in PLUGINS or 'pelican.plugins.neighbors' in PLUGINS) %}
   <div class="neighbors">
   {% if article.prev_article %}
     <a class="btn float-left" href="{{ SITEURL }}/{{ article.prev_article.url }}" title="{{ article.prev_article.title|striptags }}">
diff --git a/templates/partial/og.html b/templates/partial/og.html
index 7195851..3fc5d67 100644
--- a/templates/partial/og.html
+++ b/templates/partial/og.html
@@ -1,4 +1,4 @@
-{% if not PLUGINS or 'seo' not in PLUGINS %}
+{% if not PLUGINS or 'seo' not in PLUGINS or 'pelican.plugins.seo' not in PLUGINS %}
   {% if OG_LOCALE %}
     {% set default_locale = OG_LOCALE %}
   {% else %}
diff --git a/templates/partial/og_article.html b/templates/partial/og_article.html
index 9a929bf..2039946 100644
--- a/templates/partial/og_article.html
+++ b/templates/partial/og_article.html
@@ -1,4 +1,4 @@
-{% if not PLUGINS or 'seo' not in PLUGINS %}
+{% if not PLUGINS or 'seo' not in PLUGINS or 'pelican.plugins.seo' not in PLUGINS %}
   {% if OG_LOCALE %}
     {% set default_locale = OG_LOCALE %}
   {% else %}
diff --git a/templates/search.html b/templates/search.html
index 9a15f65..4ffd6c7 100644
--- a/templates/search.html
+++ b/templates/search.html
@@ -2,14 +2,14 @@
 {% extends 'base.html' %}
 {% block title %}{{ _('Search') }} - {{ SITENAME|striptags }}{% endblock title %}
 {% block content %}
+
 <article class="single">
   <header>
     <h1 id="categories">{{ _('Search Results') }}</h1>
   </header>
   <div id="tipue_search_content"></div>
 </article>
-{% endblock content %}
-{% block additional_js %}
+{% endblock content %} {% block additional_js %}
 <script src="{{ SITEURL }}/{{ THEME_STATIC_DIR }}/tipuesearch/jquery.min.js"></script>
 <script src="{{ SITEURL }}/{{ THEME_STATIC_DIR }}/tipuesearch/tipuesearch.min.js"></script>
 <script src="{{ SITEURL }}/{{ THEME_STATIC_DIR }}/tipuesearch/tipuesearch_set.min.js"></script>
@@ -23,5 +23,4 @@
     });
   });
 </script>
-{% endblock additional_js %}
-{% endif %}
+{% endblock %} {% endif %}