diff --git a/Source/Applications/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/AdditionalFields/ByAdditionalField.tsx b/Source/Applications/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/AdditionalFields/ByAdditionalField.tsx
index b0dffaacf..d15a410f8 100644
--- a/Source/Applications/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/AdditionalFields/ByAdditionalField.tsx
+++ b/Source/Applications/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/AdditionalFields/ByAdditionalField.tsx
@@ -191,7 +191,7 @@ const ByAdditionalField: Application.Types.iByComponent = (props) => {
                             Field={'ParentTable'}
                             HeaderStyle={{ width: 'auto' }}
                             RowStyle={{ width: 'auto' }}
-                            Content={({ item }) => item.ParentTable != '' ? item.ParentTable : 'No Associated Table' }
+                            Content={({ item }) => item.ParentTable != '' ? (item.ParentTable === 'Location' ? 'Substation' : item.ParentTable) : 'No Associated Table' }
                         > Parent Type
                         </Column>
                         <Column<SystemCenter.Types.AdditionalFieldView>
diff --git a/Source/Applications/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/ExternalDB/ExternalDBTableFields.tsx b/Source/Applications/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/ExternalDB/ExternalDBTableFields.tsx
index 6f193240c..e707ad1a1 100644
--- a/Source/Applications/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/ExternalDB/ExternalDBTableFields.tsx
+++ b/Source/Applications/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/ExternalDB/ExternalDBTableFields.tsx
@@ -187,6 +187,7 @@ export default function ExternalDBTableFields(props: { TableName: string, ID: nu
                                                 Field={'ParentTable'}
                                                 HeaderStyle={{ width: 'auto' }}
                                                 RowStyle={{ width: 'auto' }}
+                                                Content={({ item }) => item.ParentTable != '' ? (item.ParentTable === 'Location' ? 'Substation' : item.ParentTable) : 'No Associated Table'}
                                             > ParentType
                                             </Column>
                                             <Column<SystemCenter.Types.AdditionalFieldView>