diff --git a/longs/models.py b/longs/models.py
index 951e8937..dacfb78b 100644
--- a/longs/models.py
+++ b/longs/models.py
@@ -28,7 +28,7 @@ from helpers.images import image_as_base64, pretty_print_dicom
 
 from anatomy.models import Modality
 
-from generic.models import Examination, Condition, Sign, ExamBase, Plane, Contrast
+from generic.models import Examination, Condition, Sign, ExamBase, Plane, Contrast, QuestionNote
 
 # from generic.models import Examination, Site, Condition, Sign
 
@@ -42,6 +42,7 @@ from django.utils import timezone
 
 import reversion
 
+from django.contrib.contenttypes.fields import GenericRelation
 
 
 image_storage = FileSystemStorage(
@@ -133,6 +134,8 @@ class Long(models.Model):
 
     series = SortedManyToManyField("LongSeries", related_name="long")
 
+    notes = GenericRelation(QuestionNote)
+
     #question_file = models.FileField(upload_to=question_file_directory_path, blank=True, null=True)
 
     def get_absolute_url(self):
diff --git a/rapids/templates/rapids/question_display_block.html b/rapids/templates/rapids/question_display_block.html
index e9912669..032f457d 100755
--- a/rapids/templates/rapids/question_display_block.html
+++ b/rapids/templates/rapids/question_display_block.html
@@ -75,7 +75,6 @@
         </li>
         {% endfor %}
     </ul>
-    {% endif %}
     <details>
         <summary>
             Suggested answers
@@ -86,6 +85,7 @@
             {% endfor %}
         </ul>
     </details>
+    {% endif %}
 </div>
 
 <details open>