diff --git a/src/lib/data/parser/ParserClientImpl.cpp b/src/lib/data/parser/ParserClientImpl.cpp
index 154558f8..2417563f 100644
--- a/src/lib/data/parser/ParserClientImpl.cpp
+++ b/src/lib/data/parser/ParserClientImpl.cpp
@@ -90,7 +90,6 @@ void ParserClientImpl::onFileParsed(const FileInfo& fileInfo)
 
 void ParserClientImpl::onCommentParsed(const ParseLocation& location)
 {
-	addNodeHierarchy(NameHierarchy(location.filePath.str()), Node::NODE_FILE);
 	addCommentLocation(location);
 }
 
diff --git a/src/lib/project/Project.cpp b/src/lib/project/Project.cpp
index 8d950112..366a9233 100644
--- a/src/lib/project/Project.cpp
+++ b/src/lib/project/Project.cpp
@@ -104,6 +104,28 @@ bool Project::refresh(bool forceRefresh)
 
 	std::shared_ptr<DialogView> dialogView = Application::getInstance()->getDialogView();
 
+	if (
+		ApplicationSettings::getInstance()->getLoggingEnabled() &&
+		ApplicationSettings::getInstance()->getVerboseIndexerLoggingEnabled() &&
+		Application::getInstance()->hasGUI()
+		)
+	{
+		std::vector<std::string> options;
+		options.push_back("Yes");
+		options.push_back("No");
+		int result = dialogView->confirm(
+			"Warning: You are about to index your project with the \"verbose indexer logging\" setting "
+			"enabled. This will cause a significant slowdown in indexing performance. Do you want to proceed?",
+			options
+		);
+
+		if (result == 1)
+		{
+			return false;
+		}
+	}
+
+
 	if (!forceRefresh && needsFullRefresh && question.size() && Application::getInstance()->hasGUI())
 	{
 		std::vector<std::string> options;