diff --git a/src/blenderbim/blenderbim/bim/data/assets/symbols.svg b/src/blenderbim/blenderbim/bim/data/assets/symbols.svg
index afd3d63d14..7011554551 100644
--- a/src/blenderbim/blenderbim/bim/data/assets/symbols.svg
+++ b/src/blenderbim/blenderbim/bim/data/assets/symbols.svg
@@ -44,17 +44,17 @@
         <circle r="5" fill="white" stroke="black" style="stroke-width: 0.25;" />
         <line x1="-5" y1="0" x2="5" y2="0" style="stroke: black; stroke-width: 0.25;" />
     </g>
-    <g id="SurveyArea">
+    <g id="SURVEY">
         <circle r="1" fill="black" stroke="black" style="stroke-width: 0.25;" />
     </g>
-    <g id="SurveyArea-CONTROLPOINT">
+    <g id="SURVEY-CONTROLPOINT">
         <path style="fill: white; stroke: black; stroke-width: 0.25;" d="M 2.286165,1.4798666 H -1.0000316e-7 -2.2861651 L -1.1430826,-0.5000101 -1.0000316e-7,-2.479888 1.1430827,-0.5000101 Z" />
         <circle r="0.5" fill="black" stroke="black" style="stroke-width: 0.25;" />
     </g>
-    <g id="SurveyArea-TRAVERSEPOINT">
+    <g id="SURVEY-TRAVERSEPOINT">
         <path style="fill: white; stroke: black; stroke-width: 0.5;" d="M -2,-2 2,2 M -2,2 2,-2" />
     </g>
-    <g id="SurveyArea-SPOTELEVATION">
+    <g id="SURVEY-SPOTELEVATION">
         <path style="fill: white; stroke: black; stroke-width: 0.5;" d="M 0,-2 0,2 M -2,0 2,0" />
     </g>
 </svg>
diff --git a/src/blenderbim/blenderbim/bim/module/drawing/operator.py b/src/blenderbim/blenderbim/bim/module/drawing/operator.py
index d85cd2dbe9..232b845518 100644
--- a/src/blenderbim/blenderbim/bim/module/drawing/operator.py
+++ b/src/blenderbim/blenderbim/bim/module/drawing/operator.py
@@ -1057,7 +1057,9 @@ class CreateDrawing(bpy.types.Operator):
 
         elements = tool.Drawing.get_group_elements(tool.Drawing.get_drawing_group(self.camera_element))
         filtered_drawing_elements = tool.Drawing.get_drawing_elements(self.camera_element)
-        elements = [e for e in elements if e in filtered_drawing_elements]
+        filtered_drawing_annotations = {e for e in filtered_drawing_elements if e.is_a("IfcAnnotation")}
+        elements = {e for e in elements if e in filtered_drawing_elements}
+        elements = list(elements | filtered_drawing_annotations)
 
         annotations = sorted(
             elements, key=lambda a: (tool.Drawing.get_annotation_z_index(a), 1 if a.ObjectType == "TEXT" else 0)