diff --git a/src/lib/component/controller/UndoRedoController.cpp b/src/lib/component/controller/UndoRedoController.cpp
index d52d222d..0c6643bf 100644
--- a/src/lib/component/controller/UndoRedoController.cpp
+++ b/src/lib/component/controller/UndoRedoController.cpp
@@ -140,7 +140,9 @@ void UndoRedoController::handleMessage(MessageRefresh* message)
 
 	if (requiresActivateFallbackToken())
 	{
-		Id nodeId = m_storageAccess->getIdForNodeWithNameHierarchy(NameHierarchy("main"));
+		NameHierarchy mainNameHierarchy;
+		mainNameHierarchy.push(std::make_shared<NameElement>("main", "int main()"));
+		Id nodeId = m_storageAccess->getIdForNodeWithNameHierarchy(mainNameHierarchy);
 		if (!nodeId)
 		{
 			nodeId = m_storageAccess->getIdForFirstNode();
diff --git a/src/lib/data/Storage.cpp b/src/lib/data/Storage.cpp
index 84735816..6834acc8 100644
--- a/src/lib/data/Storage.cpp
+++ b/src/lib/data/Storage.cpp
@@ -761,15 +761,7 @@ Id Storage::onCommentParsed(const ParseLocation& location)
 
 Id Storage::getIdForNodeWithNameHierarchy(const NameHierarchy& nameHierarchy) const
 {
-	// return m_sqliteStorage.getNodeBySerializedName(NameHierarchy::serialize(nameHierarchy)).id;
-
-	const SearchNode* node = m_tokenIndex.getNode(nameHierarchy);
-	if (node)
-	{
-		return node->getFirstTokenId();
-	}
-
-	return 0;
+	return m_sqliteStorage.getNodeBySerializedName(NameHierarchy::serialize(nameHierarchy)).id;
 }
 
 Id Storage::getIdForEdge(
diff --git a/src/test/SqliteStorageTestSuite.h b/src/test/SqliteStorageTestSuite.h
index ac3631f4..272e648e 100644
--- a/src/test/SqliteStorageTestSuite.h
+++ b/src/test/SqliteStorageTestSuite.h
@@ -14,6 +14,7 @@ public:
 		int nodeCount = -1;
 		{
 			SqliteStorage storage(databasePath);
+			storage.init();
 			storage.beginTransaction();
 			storage.addNode(0, "a", false);
 			storage.commitTransaction();
@@ -30,6 +31,7 @@ public:
 		int nodeCount = -1;
 		{
 			SqliteStorage storage(databasePath);
+			storage.init();
 			storage.beginTransaction();
 			int nodeId = storage.addNode(0, "a", false);
 			storage.removeElement(nodeId);
@@ -47,6 +49,7 @@ public:
 		int edgeCount = -1;
 		{
 			SqliteStorage storage(databasePath);
+			storage.init();
 			storage.beginTransaction();
 			int sourceNodeId = storage.addNode(0, "a", false);
 			int targetNodeId = storage.addNode(0, "b", false);
@@ -65,6 +68,7 @@ public:
 		int edgeCount = -1;
 		{
 			SqliteStorage storage(databasePath);
+			storage.init();
 			storage.beginTransaction();
 			int sourceNodeId = storage.addNode(0, "a", false);
 			int targetNodeId = storage.addNode(0, "b", false);
diff --git a/src/test/StorageTestSuite.h b/src/test/StorageTestSuite.h
index 743c9481..5a7c8026 100644
--- a/src/test/StorageTestSuite.h
+++ b/src/test/StorageTestSuite.h
@@ -651,12 +651,12 @@ private:
 		}
 	};
 
-	ParseLocation validLocation(Id locationId = 0) const // id is not used as id ..... who programs this? ebsi? :P
+	ParseLocation validLocation(Id locationId = 0) const
 	{
 		return ParseLocation(m_filePath, 1, locationId, 1, locationId);
 	}
 
-	bool isValidLocation(TokenLocation* location, Id locationId) const // remove this one
+	bool isValidLocation(TokenLocation* location, Id locationId) const
 	{
 		return
 			location->getFilePath() == m_filePath &&