diff --git a/src/components/Fhir/Encounter.js b/src/components/Fhir/Encounter.js
index ddbe407..23ddb33 100644
--- a/src/components/Fhir/Encounter.js
+++ b/src/components/Fhir/Encounter.js
@@ -7,7 +7,7 @@ import Period      from "./Period"
 
 function getEncounterClass(encounter) {
     return encounter.class && typeof encounter.class == "object" ?
-        getPath(encounter, "class.type.0.text") :
+        getPath(encounter, "class.display") :
         encounter.class;
 }
 
@@ -63,7 +63,7 @@ export default class Encounter extends React.Component
                     },
                     {
                         label: "Reason",
-                        path : "reason.0.coding.0.display",
+                        path : "reasonCode.0.coding.0.display",
                         defaultValue: "N/A"
                     },
                     {