diff --git a/src/lib/component/controller/GraphController.cpp b/src/lib/component/controller/GraphController.cpp
index 4d01a3a2..6c3819a4 100644
--- a/src/lib/component/controller/GraphController.cpp
+++ b/src/lib/component/controller/GraphController.cpp
@@ -25,7 +25,7 @@ void GraphController::handleMessage(MessageActivateToken* message)
 
 void GraphController::handleMessage(MessageActivateTokens* message)
 {
-	createDummyGraphForTokenId(message->tokenIds[0], &GraphLayouter::layoutSimpleRing);
+	//createDummyGraphForTokenId(message->tokenIds[0], &GraphLayouter::layoutSimpleRing);
 }
 
 GraphView* GraphController::getView()
diff --git a/src/lib/data/graph/Node.cpp b/src/lib/data/graph/Node.cpp
index c9c23932..aa9cfe39 100644
--- a/src/lib/data/graph/Node.cpp
+++ b/src/lib/data/graph/Node.cpp
@@ -54,7 +54,7 @@ bool Node::isType(NodeTypeMask mask) const
 	return (m_type & mask) > 0;
 }
 
-const std::string& Node::getName() const
+std::string Node::getName() const
 {
 	return m_nameComponent->getName();
 }
diff --git a/src/lib/data/graph/Node.h b/src/lib/data/graph/Node.h
index d6a1abb5..8f0cc580 100644
--- a/src/lib/data/graph/Node.h
+++ b/src/lib/data/graph/Node.h
@@ -45,7 +45,7 @@ public:
 	void setType(NodeType type);
 	bool isType(NodeTypeMask mask) const;
 
-	const std::string& getName() const;
+	std::string getName() const;
 	std::string getFullName() const;
 
 	const std::vector<Edge*>& getEdges() const;
diff --git a/src/lib/data/graph/token_component/TokenComponentName.cpp b/src/lib/data/graph/token_component/TokenComponentName.cpp
index 802f6ea0..0ebd12be 100644
--- a/src/lib/data/graph/token_component/TokenComponentName.cpp
+++ b/src/lib/data/graph/token_component/TokenComponentName.cpp
@@ -30,7 +30,7 @@ std::shared_ptr<TokenComponent> TokenComponentNameReferenced::copy() const
 	return std::make_shared<TokenComponentNameCached>(getFullName());
 }
 
-const std::string& TokenComponentNameReferenced::getName() const
+std::string TokenComponentNameReferenced::getName() const
 {
 	return m_searchNode->getName();
 }
@@ -55,7 +55,7 @@ std::shared_ptr<TokenComponent> TokenComponentNameCached::copy() const
 	return std::make_shared<TokenComponentNameCached>(m_fullName);
 }
 
-const std::string& TokenComponentNameCached::getName() const
+std::string TokenComponentNameCached::getName() const
 {
 	return utility::split(m_fullName, SearchIndex::DELIMITER).back();
 }
diff --git a/src/lib/data/graph/token_component/TokenComponentName.h b/src/lib/data/graph/token_component/TokenComponentName.h
index 6a731104..b581b39f 100644
--- a/src/lib/data/graph/token_component/TokenComponentName.h
+++ b/src/lib/data/graph/token_component/TokenComponentName.h
@@ -15,7 +15,7 @@ public:
 
 	std::shared_ptr<TokenComponentName> copyComponentName() const;
 
-	virtual const std::string& getName() const = 0;
+	virtual std::string getName() const = 0;
 	virtual std::string getFullName() const = 0;
 };
 
@@ -29,7 +29,7 @@ public:
 
 	virtual std::shared_ptr<TokenComponent> copy() const;
 
-	virtual const std::string& getName() const;
+	virtual std::string getName() const;
 	virtual std::string getFullName() const;
 
 private:
@@ -46,7 +46,7 @@ public:
 
 	virtual std::shared_ptr<TokenComponent> copy() const;
 
-	virtual const std::string& getName() const;
+	virtual std::string getName() const;
 	virtual std::string getFullName() const;
 
 private: