Index: /main/waeup.aaue/trunk/src/waeup/aaue/students/reports/raw_score_report.py
===================================================================
--- /main/waeup.aaue/trunk/src/waeup/aaue/students/reports/raw_score_report.py	(revision 16675)
+++ /main/waeup.aaue/trunk/src/waeup/aaue/students/reports/raw_score_report.py	(revision 16676)
@@ -72,6 +72,8 @@
         final_level = max(level_obj.student['studycourse'].keys())
         # Filter out all students with extension levels.
-        if int(final_level) > level_obj.student['studycourse'].certificate.end_level:
-            return True
+        # Filter out all students with extension levels (only if end_level has been selected)
+        if level_obj.level == level_obj.student['studycourse'].certificate.end_level:
+            if int(final_level) > level_obj.student['studycourse'].certificate.end_level:
+                return True
         final_level_obj = level_obj.student['studycourse'][final_level]
         if final_level_obj.remark not in (
Index: /main/waeup.aaue/trunk/src/waeup/aaue/students/reports/session_results_presentation.py
===================================================================
--- /main/waeup.aaue/trunk/src/waeup/aaue/students/reports/session_results_presentation.py	(revision 16675)
+++ /main/waeup.aaue/trunk/src/waeup/aaue/students/reports/session_results_presentation.py	(revision 16676)
@@ -127,7 +127,8 @@
         """
         final_level = max(level_obj.student['studycourse'].keys())
-        # Filter out all students with extension levels.
-        if int(final_level) > level_obj.student['studycourse'].certificate.end_level:
-            return True
+        # Filter out all students with extension levels (only if end_level has been selected)
+        if level_obj.level == level_obj.student['studycourse'].certificate.end_level:
+            if int(final_level) > level_obj.student['studycourse'].certificate.end_level:
+                return True
         final_level_obj = level_obj.student['studycourse'][final_level]
         if final_level_obj.remark not in (
