diff --git a/ram/portal/templates/cards.html b/ram/portal/templates/cards.html
index b1da629..6575f78 100644
--- a/ram/portal/templates/cards.html
+++ b/ram/portal/templates/cards.html
@@ -56,7 +56,7 @@
                   <tr>
                     <th width="35%" scope="row">Manufacturer</th>
                     <td>{%if d.manufacturer %}
-                      <a href="{% url 'filtered' _filter="manufacturer" search=d.manufacturer.safe_name %}">{{ d.manufacturer }}{% if d.manufactured.website %}</a> <a href="{{ d.manufactured.website }}" target="_blank"><i class="bi bi-box-arrow-up-right"></i></a>{% endif %}
+                      <a href="{% url 'filtered' _filter="manufacturer" search=d.manufacturer.safe_name %}">{{ d.manufacturer }}{% if d.manufacturer.website %}</a> <a href="{{ d.manufacturer.website }}" target="_blank"><i class="bi bi-box-arrow-up-right"></i></a>{% endif %}
                     {% endif %}</td>
                   </tr>
                   <tr>
diff --git a/ram/portal/templates/consists.html b/ram/portal/templates/consists.html
index 2c2642f..ff95e49 100644
--- a/ram/portal/templates/consists.html
+++ b/ram/portal/templates/consists.html
@@ -64,12 +64,12 @@
       {% endfor %}
       {% endblock %}
       {% block pagination %}
-      {% if consist.has_other_pages %}
+      {% if data.has_other_pages %}
       <nav aria-label="Page navigation example">
         <ul class="pagination justify-content-center mt-4 mb-0">
-          {% if consist.has_previous %}
+          {% if data.has_previous %}
           <li class="page-item">
-            <a class="page-link" href="{% url 'consists_pagination' page=consist.previous_page_number %}#rolling-stock" tabindex="-1">Previous</a>
+            <a class="page-link" href="{% url 'consists_pagination' page=data.previous_page_number %}#rolling-stock" tabindex="-1">Previous</a>
           </li>
           {% else %}
           <li class="page-item disabled">
@@ -77,21 +77,21 @@
           </li>
           {% endif %}
           {% for i in page_range %}
-            {% if consist.number == i %}
+            {% if data.number == i %}
             <li class="page-item active">
               <span class="page-link">{{ i }}</span></span>
             </li>
             {% else %}
-              {% if i == consist.paginator.ELLIPSIS %}
+              {% if i == data.paginator.ELLIPSIS %}
               <li class="page-item"><span class="page-link">{{ i }}</span></li>
               {% else %}
               <li class="page-item"><a class="page-link" href="{% url 'consists_pagination' page=i %}#rolling-stock">{{ i }}</a></li>
               {% endif %}
             {% endif %}
           {% endfor %}
-          {% if consist.has_next %}
+          {% if data.has_next %}
           <li class="page-item">
-            <a class="page-link" href="{% url 'consists_pagination' page=consist.next_page_number %}#rolling-stock" tabindex="-1">Next</a>
+            <a class="page-link" href="{% url 'consists_pagination' page=data.next_page_number %}#rolling-stock" tabindex="-1">Next</a>
           </li>
           {% else %}
           <li class="page-item disabled">
diff --git a/ram/portal/templates/manufacturers.html b/ram/portal/templates/manufacturers.html
index 8e60447..dab3c8b 100644
--- a/ram/portal/templates/manufacturers.html
+++ b/ram/portal/templates/manufacturers.html
@@ -43,12 +43,13 @@
       {% endfor %}
       {% endblock %}
       {% block pagination %}
-      {% if manufacturers.has_other_pages %}
+      {% if data.has_other_pages %}
+      {% with data.0.category as c %}
       <nav aria-label="Page navigation example">
         <ul class="pagination justify-content-center mt-4 mb-0">
-          {% if manufacturers.has_previous %}
+          {% if data.has_previous %}
           <li class="page-item">
-            <a class="page-link" href="{% url 'manufacturers_pagination' category=category page=manufacturers.previous_page_number %}#rolling-stock" tabindex="-1">Previous</a>
+            <a class="page-link" href="{% url 'manufacturers_pagination' category=c page=data.previous_page_number %}#rolling-stock" tabindex="-1">Previous</a>
           </li>
           {% else %}
           <li class="page-item disabled">
@@ -56,21 +57,21 @@
           </li>
           {% endif %}
           {% for i in page_range %}
-            {% if manufacturers.number == i %}
+            {% if data.number == i %}
             <li class="page-item active">
               <span class="page-link">{{ i }}</span></span>
             </li>
             {% else %}
-              {% if i == manufacturers.paginator.ELLIPSIS %}
+              {% if i == data.paginator.ELLIPSIS %}
               <li class="page-item"><span class="page-link">{{ i }}</span></li>
               {% else %}
-              <li class="page-item"><a class="page-link" href="{% url 'manufacturers_pagination' category=category page=i %}#rolling-stock">{{ i }}</a></li>
+              <li class="page-item"><a class="page-link" href="{% url 'manufacturers_pagination' category=c page=i %}#rolling-stock">{{ i }}</a></li>
               {% endif %}
             {% endif %}
           {% endfor %}
-          {% if manufacturers.has_next %}
+          {% if data.has_next %}
           <li class="page-item">
-            <a class="page-link" href="{% url 'manufacturers_pagination' category=category page=manufacturers.next_page_number %}#rolling-stock" tabindex="-1">Next</a>
+            <a class="page-link" href="{% url 'manufacturers_pagination' category=c page=data.next_page_number %}#rolling-stock" tabindex="-1">Next</a>
           </li>
           {% else %}
           <li class="page-item disabled">
@@ -79,5 +80,6 @@
           {% endif %}
         </ul>
       </nav>
+      {% endwith %}
       {% endif %}
       {% endblock %}
diff --git a/ram/ram/__init__.py b/ram/ram/__init__.py
index 8e9f569..e493d21 100644
--- a/ram/ram/__init__.py
+++ b/ram/ram/__init__.py
@@ -1,4 +1,4 @@
 from ram.utils import git_suffix
 
-__version__ = "0.1.0"
+__version__ = "0.1.1"
 __version__ += git_suffix(__file__)