diff --git a/plans/entities.plan b/plans/entities.plan
index b54e298c9be0c2cd2f9ec8e337322c542616a18a..a513512fbdf6bda13c4db7a24a8ca6446b12ce43 100644
--- a/plans/entities.plan
+++ b/plans/entities.plan
@@ -1293,85 +1293,68 @@
 	  <text>"{SENT}"</text>
 	</annotations>
 	<annotations>
-	  <instances>layer:habitats</instances>
-	  <text>"{habitat}" ^ @concept-path ^ "/"</text>
-	</annotations>
-	<annotations>
-	  <instances>layer:phenotypes</instances>
-	  <text>"{phenotype}" ^ @concept-path ^ "/"</text>
-	</annotations>
-	<annotations>
-	  <instances>layer:uses</instances>
-	  <text>"{use}" ^ @concept-path ^ "/"</text>
-	</annotations>
-	<annotations>
-	  <instances>relations:CooccurrenceLocalization.tuples</instances>
+	  <instances>layer:habitats.sort:nsval(nav:features:concept-path, @value)</instances>
+	  <identifier>nav:parent.id:unique</identifier>
+	  <text>"{habitat}" ^ @value ^ "/"</text>
 	  <fragments>
-	    <instances>sort:ival(args, start)</instances>
+	    <instances>$</instances>
+	    <start>nav:parent.start</start>
+	    <end>nav:parent.end</end>
 	  </fragments>
-	  <text>"{livesin}{taxon}" ^ args:Bacterium.@path ^ "/~{habitat}" ^ args:Localization.@concept-path ^ "/"</text>
-	  <arguments>
-	    <taxon>args:Bacterium.id:unique</taxon>
-	    <habitat>args:Localization.id:unique</habitat>
-	  </arguments>
 	</annotations>
 	<annotations>
-	  <instances>relations:CooccurrenceLocalization.tuples</instances>
+	  <instances>layer:phenotypes.sort:nsval(nav:features:concept-path, @value)</instances>
+	  <identifier>nav:parent.id:unique</identifier>
+	  <text>"{phenotype}" ^ @value ^ "/"</text>
 	  <fragments>
-	    <instances>sort:ival(args, start)</instances>
+	    <instances>$</instances>
+	    <start>nav:parent.start</start>
+	    <end>nav:parent.end</end>
 	  </fragments>
-	  <text>"{livesin}" ^ args:Bacterium.@form ^ "/~" ^ args:Localization.@form ^ "/"</text>
-	  <arguments>
-	    <taxon>args:Bacterium.id:unique</taxon>
-	    <habitat>args:Localization.id:unique</habitat>
-	  </arguments>
 	</annotations>
 	<annotations>
-	  <instances>relations:PhenotypeRelation.tuples</instances>
+	  <instances>layer:uses.sort:nsval(nav:features:concept-path, @value)</instances>
+	  <identifier>nav:parent.id:unique</identifier>
+	  <text>"{use}" ^ @value ^ "/"</text>
 	  <fragments>
-	    <instances>sort:ival(args, start)</instances>
+	    <instances>$</instances>
+	    <start>nav:parent.start</start>
+	    <end>nav:parent.end</end>
 	  </fragments>
-	  <text>"{exhibits}{taxon}" ^ args:Microorganism.@path ^ "/~{phenotype}" ^ args:Phenotype.@concept-path ^ "/"</text>
-	  <arguments>
-	    <taxon>args:Microorganism.id:unique</taxon>
-	    <phenotype>args:Phenotype.id:unique</phenotype>
-	  </arguments>
 	</annotations>
 	<annotations>
-	  <instances>relations:PhenotypeRelation.tuples</instances>
+	  <instances>relations:CooccurrenceLocalization.tuples.nav:arguments[@role == "Localization"].sort:nsval(nav:features:concept-path, @value)</instances>
 	  <fragments>
-	    <instances>sort:ival(args, start)</instances>
+	    <instances>sort:ival(nav:parent.nav:parent.args, start)</instances>
 	  </fragments>
-	  <text>"{exhibits}" ^ args:Microorganism.@form ^ "/~" ^ args:Phenotype.@form ^ "/"</text>
+	  <text>"{livesin}{taxon}" ^ nav:parent.nav:parent.args:Bacterium.@path ^ "/~{habitat}" ^ @value ^ "/"</text>
 	  <arguments>
-	    <taxon>args:Microorganism.id:unique</taxon>
-	    <phenotype>args:Phenotype.id:unique</phenotype>
+	    <taxon>nav:parent.nav:parent.args:Bacterium.id:unique</taxon>
+	    <habitat>nav:parent.nav:parent.args:Localization.id:unique</habitat>
 	  </arguments>
 	</annotations>
-
 	<annotations>
-	  <instances>relations:UseRelation.tuples</instances>
+	  <instances>relations:PhenotypeRelation.tuples.nav:arguments[@role == "Phenotype"].sort:nsval(nav:features:concept-path, @value)</instances>
 	  <fragments>
-	    <instances>sort:ival(args, start)</instances>
+	    <instances>sort:ival(nav:parent.nav:parent.args, start)</instances>
 	  </fragments>
-	  <text>"{studiedfor}{taxon}" ^ args:Microorganism.@path ^ "/~{use}" ^ args:Use.@concept-path ^ "/"</text>
+	  <text>"{exhibits}{taxon}" ^ nav:parent.nav:parent.args:Microorganism.@path ^ "/~{phenotype}" ^ @value ^ "/"</text>
 	  <arguments>
-	    <taxon>args:Microorganism.id:unique</taxon>
-	    <use>args:Use.id:unique</use>
+	    <taxon>nav:parent.nav:parent.args:Microorganism.id:unique</taxon>
+	    <phenotype>nav:parent.nav:parent.args:Phenotype.id:unique</phenotype>
 	  </arguments>
 	</annotations>
 	<annotations>
-	  <instances>relations:UseRelation.tuples</instances>
+	  <instances>relations:UseRelation.tuples.nav:arguments[@role == "Use"].sort:nsval(nav:features:concept-path, @value)</instances>
 	  <fragments>
-	    <instances>sort:ival(args, start)</instances>
+	    <instances>sort:ival(nav:parent.nav:parent.args, start)</instances>
 	  </fragments>
-	  <text>"{studiedfor}" ^ args:Microorganism.@form ^ "/~" ^ args:Use.@form ^ "/"</text>
+	  <text>"{studiedfor}{taxon}" ^ nav:parent.nav:parent.args:Microorganism.@path ^ "/~{use}" ^ @value ^ "/"</text>
 	  <arguments>
-	    <taxon>args:Microorganism.id:unique</taxon>
-	    <use>args:Use.id:unique</use>
+	    <taxon>nav:parent.nav:parent.args:Microorganism.id:unique</taxon>
+	    <use>nav:parent.nav:parent.args:Use.id:unique</use>
 	  </arguments>
 	</annotations>
-
       </fields>
       <fields>
 	<instances>nav:features:mesh-name</instances>