diff --git a/bin/app/data/color_schemes/bad_rainbow.xml b/bin/app/data/color_schemes/bad_rainbow.xml
index cf55fcb3..96a60d48 100644
--- a/bin/app/data/color_schemes/bad_rainbow.xml
+++ b/bin/app/data/color_schemes/bad_rainbow.xml
@@ -232,9 +232,9 @@
 					<normal>#FFFFFF</normal>
 				</icon>
 			</type>
-			<builtin_type>
+			<built_in_type>
 				<like>type</like>
-			</builtin_type>
+			</built_in_type>
 			<class>
 				<like>type</like>
 			</class>
@@ -294,9 +294,9 @@
 				<like>global_variable</like>
 			</enum_constant>
 
-			<undefined>
+			<non-indexed>
 				<like>type</like>
-			</undefined>
+			</non-indexed>
 			<namespace>
 				<fill>
 					<normal>#873E3E</normal>
diff --git a/bin/app/data/color_schemes/bright.xml b/bin/app/data/color_schemes/bright.xml
index 05980902..6a7c524d 100644
--- a/bin/app/data/color_schemes/bright.xml
+++ b/bin/app/data/color_schemes/bright.xml
@@ -224,9 +224,9 @@
 					<focus>#3C3C3C</focus>
 				</border>
 			</type>
-			<builtin_type>
+			<built_in_type>
 				<like>type</like>
-			</builtin_type>
+			</built_in_type>
 			<class>
 				<like>type</like>
 			</class>
@@ -280,9 +280,9 @@
 				<like>global_variable</like>
 			</enum_constant>
 
-			<undefined>
+			<non_indexed>
 				<like>type</like>
-			</undefined>
+			</non_indexed>
 			<namespace>
 				<fill>
 					<normal>#EFC5C5</normal>
diff --git a/bin/app/data/color_schemes/dark.xml b/bin/app/data/color_schemes/dark.xml
index 1b822ba6..71d51b35 100644
--- a/bin/app/data/color_schemes/dark.xml
+++ b/bin/app/data/color_schemes/dark.xml
@@ -227,9 +227,9 @@
 					<focus>#C3C3C3</focus>
 				</border>
 			</type>
-			<builtin_type>
+			<built_in_type>
 				<like>type</like>
-			</builtin_type>
+			</built_in_type>
 			<class>
 				<like>type</like>
 			</class>
@@ -283,9 +283,9 @@
 				<like>global_variable</like>>
 			</enum_constant>
 
-			<undefined>
+			<non-indexed>
 				<like>type</like>
-			</undefined>
+			</non-indexed>
 			<namespace>
 				<fill>
 					<normal>#78282D</normal>
diff --git a/src/lib/data/PersistentStorage.cpp b/src/lib/data/PersistentStorage.cpp
index 5619fc85..ba72feb7 100644
--- a/src/lib/data/PersistentStorage.cpp
+++ b/src/lib/data/PersistentStorage.cpp
@@ -835,19 +835,23 @@ std::shared_ptr<Graph> PersistentStorage::getGraphForActiveTokenIds(const std::v
 		{
 			nodeIds.push_back(node.id);
 		}
-		for (const StorageFile& file : m_sqliteStorage.getAllByIds<StorageFile>(ids))
-		{
-			nodeIds.push_back(file.id);
-		}
 
-		if (nodeIds.size() != ids.size())
+		if (!isNamespace)
 		{
-			std::vector<StorageEdge> edges = m_sqliteStorage.getAllByIds<StorageEdge>(ids);
-			for (const StorageEdge& edge : edges)
+			for (const StorageFile& file : m_sqliteStorage.getAllByIds<StorageFile>(ids))
 			{
-				if (edge.id > 0)
+				nodeIds.push_back(file.id);
+			}
+
+			if (nodeIds.size() != ids.size())
+			{
+				std::vector<StorageEdge> edges = m_sqliteStorage.getAllByIds<StorageEdge>(ids);
+				for (const StorageEdge& edge : edges)
 				{
-					edgeIds.push_back(edge.id);
+					if (edge.id > 0)
+					{
+						edgeIds.push_back(edge.id);
+					}
 				}
 			}
 		}