diff --git a/views/diagnosticreport_flat_view.json b/views/diagnosticreport_flat_view.json
index 4313907..b583e6d 100644
--- a/views/diagnosticreport_flat_view.json
+++ b/views/diagnosticreport_flat_view.json
@@ -9,6 +9,41 @@
           "path": "getResourceKey()",
           "name": "id",
           "type": "string"
+        },
+        {
+          "path": "encounter.getReferenceKey(Encounter)",
+          "name": "encounter_id",
+          "type": "string"
+        }
+      ]
+    },
+    {
+      "forEachOrNull": "category.coding",
+      "column": [
+        {
+          "path": "code",
+          "name": "category",
+          "type": "string"
+        }
+      ]
+    },
+    {
+      "forEachOrNull": "code.coding",
+      "column": [
+        {
+          "path": "code",
+          "name": "code",
+          "type": "string"
+        },
+        {
+          "path": "system",
+          "name": "code_system",
+          "type": "string"
+        },
+        {
+          "path": "display",
+          "name": "code_display",
+          "type": "string"
         }
       ]
     }
diff --git a/views/immunization_flat_view.json b/views/immunization_flat_view.json
index a337973..c931c37 100644
--- a/views/immunization_flat_view.json
+++ b/views/immunization_flat_view.json
@@ -9,6 +9,11 @@
           "path": "getResourceKey()",
           "name": "id",
           "type": "string"
+        },
+        {
+          "path": "encounter.getReferenceKey(Encounter)",
+          "name": "encounter_id",
+          "type": "string"
         }
       ]
     }
diff --git a/views/observation_flat_view.json b/views/observation_flat_view.json
index 840c03a..ccf9893 100644
--- a/views/observation_flat_view.json
+++ b/views/observation_flat_view.json
@@ -25,16 +25,6 @@
           "name": "status",
           "type": "string"
         },
-        {
-          "forEachOrNull": "category.coding",
-          "column": [
-            {
-              "path": "code",
-              "name": "category",
-              "type": "string"
-            }
-          ]
-        },
         {
           "path": "effective.ofType(dateTime)",
           "name": "obs_date",
@@ -92,6 +82,16 @@
         }
       ]
     },
+    {
+      "forEachOrNull": "category.coding",
+      "column": [
+        {
+          "path": "code",
+          "name": "category",
+          "type": "string"
+        }
+      ]
+    },
     {
       "forEachOrNull": "code.coding",
       "column": [
diff --git a/views/procedure_flat_view.json b/views/procedure_flat_view.json
index 7351bc1..f3ab15e 100644
--- a/views/procedure_flat_view.json
+++ b/views/procedure_flat_view.json
@@ -9,6 +9,11 @@
           "path": "getResourceKey()",
           "name": "id",
           "type": "string"
+        },
+        {
+          "path": "encounter.getReferenceKey(Encounter)",
+          "name": "encounter_id",
+          "type": "string"
         }
       ]
     }