diff --git a/repository/Grafoscopio/GrafoscopioNode.class.st b/repository/Grafoscopio/GrafoscopioNode.class.st
index e3000a2..7f0038b 100644
--- a/repository/Grafoscopio/GrafoscopioNode.class.st
+++ b/repository/Grafoscopio/GrafoscopioNode.class.st
@@ -580,6 +580,7 @@ GrafoscopioNode >> isEmpty [
 
 { #category : #operation }
 GrafoscopioNode >> isTaggedAs: aString [
+	self tags ifEmpty: [ self tagAs: 'text' ].
 	^ self tags includes: aString
 ]
 
@@ -955,7 +956,7 @@ GrafoscopioNode >> tagAs: aTag [
 
 { #category : #accessing }
 GrafoscopioNode >> tags [ 
-	"Returns the receiver tags. For the moment is just one... yes silly, but will be extended properly"
+	"I returns the receiver tags."
 	| migration |
 	tags isString 
 		ifTrue: [ 
diff --git a/repository/Grafoscopio/GrafoscopioNotebook.class.st b/repository/Grafoscopio/GrafoscopioNotebook.class.st
index 619b2e4..10c7501 100644
--- a/repository/Grafoscopio/GrafoscopioNotebook.class.st
+++ b/repository/Grafoscopio/GrafoscopioNotebook.class.st
@@ -67,8 +67,7 @@ GrafoscopioNotebook >> addCommandFrom: dictionary into: stream [
 
 { #category : #'editing nodes' }
 GrafoscopioNotebook >> addNode [
-	| addedNode |	
-	addedNode := tree highlightedItem content addNodeAfterMe.
+	self currentNodeContent addNodeAfterMe.
 	self notebookContent: notebook.
 ]