{% endfor %}
diff --git a/anatomy/templates/anatomy/partials/mark2_marked_list_fragment.html b/anatomy/templates/anatomy/partials/mark2_marked_list_fragment.html
index af1ea860..aedaa27b 100644
--- a/anatomy/templates/anatomy/partials/mark2_marked_list_fragment.html
+++ b/anatomy/templates/anatomy/partials/mark2_marked_list_fragment.html
@@ -1,10 +1,52 @@
{% comment %}Renders only the list items for already-marked answers (used as a partial){% endcomment %}
{% for answer in correct_answers %}
-
+ {% endwith %}
{% endfor %}
diff --git a/anatomy/templates/anatomy/partials/mark2_unmarked_list_fragment.html b/anatomy/templates/anatomy/partials/mark2_unmarked_list_fragment.html
index fcb015e3..9285dd20 100644
--- a/anatomy/templates/anatomy/partials/mark2_unmarked_list_fragment.html
+++ b/anatomy/templates/anatomy/partials/mark2_unmarked_list_fragment.html
@@ -1,8 +1,34 @@
{% comment %}Renders only the list items for unmarked answers (used as a partial){% endcomment %}
{% for answer in user_answers %}
- {% if answer in answer_suggest_incorrect %}
-
{{ answer }}
- {% else %}
-
{{ answer }}
- {% endif %}
+ {% with answer_url=answer|urlencode:'' %}
+ {% if answer in answer_suggest_incorrect %}
+