diff --git a/src/lib/data/Storage.cpp b/src/lib/data/Storage.cpp
index 6834acc8..84735816 100644
--- a/src/lib/data/Storage.cpp
+++ b/src/lib/data/Storage.cpp
@@ -761,7 +761,15 @@ Id Storage::onCommentParsed(const ParseLocation& location)
 
 Id Storage::getIdForNodeWithNameHierarchy(const NameHierarchy& nameHierarchy) const
 {
-	return m_sqliteStorage.getNodeBySerializedName(NameHierarchy::serialize(nameHierarchy)).id;
+	// return m_sqliteStorage.getNodeBySerializedName(NameHierarchy::serialize(nameHierarchy)).id;
+
+	const SearchNode* node = m_tokenIndex.getNode(nameHierarchy);
+	if (node)
+	{
+		return node->getFirstTokenId();
+	}
+
+	return 0;
 }
 
 Id Storage::getIdForEdge(
diff --git a/src/lib_gui/qt/window/QtProjectSetupScreen.cpp b/src/lib_gui/qt/window/QtProjectSetupScreen.cpp
index 8bb5148e..968bdd0c 100644
--- a/src/lib_gui/qt/window/QtProjectSetupScreen.cpp
+++ b/src/lib_gui/qt/window/QtProjectSetupScreen.cpp
@@ -94,6 +94,9 @@ void QtProjectSetupScreen::loadEmpty()
 {
 	updateTitle("NEW PROJECT");
 	updateDoneButton("Create");
+
+	m_cppStandard->setCurrentIndex(5);
+	m_cStandard->setCurrentIndex(4);
 }
 
 void QtProjectSetupScreen::loadProjectSettings()