diff --git a/apps/common/templates/generic_list.html b/apps/common/templates/generic_list.html
index 064a9752ed..19e7a34b51 100644
--- a/apps/common/templates/generic_list.html
+++ b/apps/common/templates/generic_list.html
@@ -1,15 +1,24 @@
 {% extends "base.html" %}
 {% load i18n %}
 {% load navigation_tags %}
+{% load subtemplates_tags %}
+
 {% block title %} :: {% blocktrans with title|striptags as stripped_title %}List of {{ stripped_title }}{% endblocktrans %}{% endblock %}
 {#{% block secondary_links %}{{ secondary_links|safe }}{% endblock %}#}
 
 {% block sidebar %}
-    {% for subtemplate in sidebar_subtemplates %}
-        <div class="generic_subform">
-            {% include subtemplate %}
-        </div><!--end subform-->
-    {% endfor %}
+    {% for subtemplate in sidebar_subtemplates_list %}
+        {% if subtemplate.form %}
+            {% render_subtemplate subtemplate.name subtemplate.context as rendered_subtemplate %}
+                <div class="generic_subform">
+                    {{ rendered_subtemplate }}
+                </div>
+        {% else %}
+            {% render_subtemplate subtemplate.name subtemplate.context as rendered_subtemplate %}
+            {{ rendered_subtemplate }}
+        {% endif %}
+     {% endfor %}
+
 {% endblock %}
 
 {% block content %}
diff --git a/apps/ocr/views.py b/apps/ocr/views.py
index 000084aec2..45f1becf0a 100644
--- a/apps/ocr/views.py
+++ b/apps/ocr/views.py
@@ -63,10 +63,13 @@ def queue_document_list(request, queue_name='default'):
             'multi_select_as_buttons': True,
             'sidebar_subtemplates_list': [
                 {
-                    'title': _(u'document queue properties'),
                     'name': 'generic_subtemplate.html',
-                    'content': _(u'Current state: %s') % document_queue.get_state_display(),
-                }],
+                    'context': {
+                        'title': _(u'document queue properties'),
+                        'content': _(u'Current state: %s') % document_queue.get_state_display(),
+                    }
+                }
+            ]
         },
     )