diff --git a/generic/forms.py b/generic/forms.py
index 0eff30dd..9722af40 100755
--- a/generic/forms.py
+++ b/generic/forms.py
@@ -261,7 +261,7 @@ class ExamGroupsFormMixin(ModelForm):
             cid_user_group_queryset = CidUserGroup.objects.filter(
                 archive=False, open_access=True
             )
-            user_user_group_queryset = UserUserGroup.objects.none(
+            user_user_group_queryset = UserUserGroup.objects.filter(
                 archive=False, open_access=True
             )
         # cid_user_group_queryset = CidUserGroup.objects.none()
diff --git a/generic/templates/generic/exam_footer.html b/generic/templates/generic/exam_footer.html
index 95c2fa9e..88d04c38 100644
--- a/generic/templates/generic/exam_footer.html
+++ b/generic/templates/generic/exam_footer.html
@@ -1,18 +1,18 @@
 {% if can_edit %}
     <p>
-        <button id='button-edit-order' title='click and drag questions to change order' data-posturl="{% url 'anatomy:exam_json_edit' pk=exam.pk %}">Edit question order / Delete questions</button>
+        <button id='button-edit-order' title='click and drag questions to change order' data-posturl="{% url exam.get_app_name|add:':exam_json_edit' pk=exam.pk %}">Edit question order / Delete questions</button>
     </p>
     <details><summary>Additional details</summary>
         <div>
             JSON creation time: {{exam.json_creation_time}} ({{exam.json_creation_time|date:"c"}}),
             JSON creation id: {{exam.exam_json_id}}
         </div>
-        <a href="{% url 'anatomy:exam_json' pk=exam.pk %}">JSON</a>
-        <a href="{% url 'anatomy:exam_json_unbased' pk=exam.pk %}">JSON (unbased)</a>
-        <a href="{% url 'anatomy:exam_json_recreate' pk=exam.pk %}">Refresh JSON cache</a>
+        <a href="{% url exam.get_app_name|add:':exam_json' pk=exam.pk %}">JSON</a>
+        <a href="{% url exam.get_app_name|add:':exam_json_unbased' pk=exam.pk %}">JSON (unbased)</a>
+        <a href="{% url exam.get_app_name|add:':exam_json_recreate' pk=exam.pk %}">Refresh JSON cache</a>
         {% if request.user.is_superuser %}
-            <button id='button-open-access' data-posturl="{% url 'anatomy:exam_json_edit' pk=exam.pk %}">Make questions open access</button>
-            <button id='button-closed-access' data-posturl="{% url 'anatomy:exam_json_edit' pk=exam.pk %}">Make questions closed access</button>
+            <button id='button-open-access' data-posturl="{% url exam.get_app_name|add:':exam_json_edit' pk=exam.pk %}">Make questions open access</button>
+            <button id='button-closed-access' data-posturl="{% url exam.get_app_name|add:':exam_json_edit' pk=exam.pk %}">Make questions closed access</button>
         {% endif %}
     </details>
 {% endif %}
\ No newline at end of file
diff --git a/manage.py b/manage.py
index 22114320..2dea2ff2 100755
--- a/manage.py
+++ b/manage.py
@@ -30,4 +30,3 @@ if __name__ == "__main__":
             )
         raise
     execute_from_command_line(sys.argv)
-    
diff --git a/rapids/templates/rapids/exam_overview.html b/rapids/templates/rapids/exam_overview.html
index 20f098eb..f200eab1 100644
--- a/rapids/templates/rapids/exam_overview.html
+++ b/rapids/templates/rapids/exam_overview.html
@@ -33,8 +33,10 @@
                             <b>Normal</b>
                         {% endif %}
                         <br />
-                        Examination: {{ question.get_examinations }}, <a
-                            href="{% url 'rapids:mark' exam_pk=exam.pk sk=forloop.counter0 %}">Mark</a>
+                        Examination: {{ question.get_examinations }},
+                        {% if exam.exam_mode %}
+                            <a href="{% url 'rapids:mark' exam_pk=exam.pk sk=forloop.counter0 %}">Mark</a>
+                        {% endif %}
                         <span class="id"><a href="{% url 'rapids:question_detail' pk=question.pk %}">[id: {{question.pk}}]</a></span>
                     </span>
                 </li>