diff --git a/cra-client/src/components/Dino/components/details-panel/ServerConfigEventBusDisplay.js b/cra-client/src/components/Dino/components/details-panel/ServerConfigEventBusDisplay.js
index 20cca381..53d162c8 100644
--- a/cra-client/src/components/Dino/components/details-panel/ServerConfigEventBusDisplay.js
+++ b/cra-client/src/components/Dino/components/details-panel/ServerConfigEventBusDisplay.js
@@ -22,9 +22,9 @@ export default function ServerConfigEventBusDisplay(props) {
         <ul>
           <li className="details-sublist-item">Topic URL Root : {cfg.topicURLRoot}</li>
           <li className="details-sublist-item">Producer : 
-            {cfg.configurationProperties.producer ? formatBootstrapEndpoints(cfg.configurationProperties.producer) : <i>blank</i>}</li>
+            {cfg !== undefined && cfg.configurationProperties !== undefined && cfg.configurationProperties.producer ? formatBootstrapEndpoints(cfg.configurationProperties.producer) : <i>blank</i>}</li>
           <li className="details-sublist-item">Consumer : 
-            {cfg.configurationProperties.consumer ? formatBootstrapEndpoints(cfg.configurationProperties.consumer) : <i>blank</i>}</li> 
+            {cfg !== undefined && cfg.configurationProperties !== undefined && cfg.configurationProperties.consumer ? formatBootstrapEndpoints(cfg.configurationProperties.consumer) : <i>blank</i>}</li> 
           <li className="details-sublist-item">Additional Properties : {cfg.additionalProperties ? formatAdditionalProperties(cfg.additionalProperties) : <i>blank</i>}</li>
         </ul>
       </div>
diff --git a/cra-client/src/components/TypeExplorer/components/diagram/EntityInheritanceDiagram.js b/cra-client/src/components/TypeExplorer/components/diagram/EntityInheritanceDiagram.js
index a8efea4d..9f9c5e07 100644
--- a/cra-client/src/components/TypeExplorer/components/diagram/EntityInheritanceDiagram.js
+++ b/cra-client/src/components/TypeExplorer/components/diagram/EntityInheritanceDiagram.js
@@ -409,7 +409,6 @@ export default function EntityInheritanceDiagram(props) {
    */
   const typeSelected = useCallback(
     (cat, typeName) => {
-
       focusContext.typeSelected("Entity", typeName);
     },
     [focusContext]
@@ -524,7 +523,7 @@ export default function EntityInheritanceDiagram(props) {
                .attr("x", 12)
                .attr("text-anchor", "start")
                .text(d => typesContext.isTypeDeprecated("Entity", d.data.name) ? "["+d.data.name+"]" : d.data.name )
-               .on("click", d => { typeSelected("Entity", d.data.name); })
+               .on("click", d => { typeSelected("Entity", d.currentTarget.textContent); })
                .clone(true)
                .lower()
                .attr("stroke-linejoin", "round")
diff --git a/cra-client/src/components/TypeExplorer/components/diagram/EntityNeighborhoodDiagram.js b/cra-client/src/components/TypeExplorer/components/diagram/EntityNeighborhoodDiagram.js
index 2797944c..519000a0 100644
--- a/cra-client/src/components/TypeExplorer/components/diagram/EntityNeighborhoodDiagram.js
+++ b/cra-client/src/components/TypeExplorer/components/diagram/EntityNeighborhoodDiagram.js
@@ -719,7 +719,7 @@ export default function EntityNeighborhoodDiagram(props) {
            .style("font-style", d => d.inherited ? "italic" : "normal")
            .text(d => d.name)
            .text(d => typesContext.isTypeDeprecated(d.category, d.name) ? "["+d.name+"]" : d.name )
-           .on("click", d => { nodeSelected(d.category, d.name); })
+           .on("click", d => { nodeSelected("Entity", d.currentTarget.textContent); })
            .clone(true)
            .lower()
            .attr("stroke-linejoin", "round")
@@ -734,7 +734,7 @@ export default function EntityNeighborhoodDiagram(props) {
            .attr("stroke-width",1)
            .attr("stroke", "#000")
            .attr("fill", d => (d.category === "Relationship" ? "none" : "#FFF"))
-           .on("click", d => { nodeSelected(d.category, d.name); });
+           .on("click", d => { nodeSelected("Entity", d.currentTarget.textContent); });
 
     nodeEnter.append("polyline")
            .lower()
diff --git a/cra-client/src/components/TypeExplorer/components/focus-controls/FocusControls.js b/cra-client/src/components/TypeExplorer/components/focus-controls/FocusControls.js
index 99c2b22a..4d3bd9bd 100644
--- a/cra-client/src/components/TypeExplorer/components/focus-controls/FocusControls.js
+++ b/cra-client/src/components/TypeExplorer/components/focus-controls/FocusControls.js
@@ -69,7 +69,7 @@ export default function FocusControls() {
 
   const classificationSelectorHandler = (e) => {    
     const typeName = e.target.value;
-    resetRelTypeSelector();     
+    resetRelTypeSelector();    
     focusContext.typeSelected("Classification",typeName);
   };