diff --git a/webapp/rdf/display/everytime/dataGetterLabels.n3 b/webapp/rdf/display/everytime/dataGetterLabels.n3
index b51f4a978..21a81337b 100644
--- a/webapp/rdf/display/everytime/dataGetterLabels.n3
+++ b/webapp/rdf/display/everytime/dataGetterLabels.n3
@@ -1,4 +1,5 @@
 # $This file is distributed under the terms of the license in /doc/license.txt$ 
+@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
 
 #Data getter type labels
 <java:edu.cornell.mannlib.vitro.webapp.utils.dataGetter.ClassGroupPageData>  rdfs:label "Class Group Page" .
diff --git a/webapp/rdf/display/everytime/pageList.n3 b/webapp/rdf/display/everytime/pageList.n3
index 4d12e80c6..529c6122c 100644
--- a/webapp/rdf/display/everytime/pageList.n3
+++ b/webapp/rdf/display/everytime/pageList.n3
@@ -1,7 +1,7 @@
 # $This file is distributed under the terms of the license in /doc/license.txt$ 
 
-# This file is for the portions of the pageList that should not be editable, i.e.
-that it cannot be deleted and that it requires certain permissions #
+# This file is for the portions of the pageList that should not be editable, i.e.#
+# that it cannot be deleted and that it requires certain permissions #
 
 @prefix owl: <http://www.w3.org/2002/07/owl#> .
 @prefix display: <http://vitro.mannlib.cornell.edu/ontologies/display/1.1#> .
@@ -12,6 +12,5 @@ that it cannot be deleted and that it requires certain permissions #
 ### This file defines the page list menu for vitro. ###
 
 display:pageListPage
-	display:queryModel <vitro:requestDisplayModel> ; 
     display:requiresAction <java:edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission#ManageMenus> ;
     display:cannotDeletePage "true" .
\ No newline at end of file
diff --git a/webapp/rdf/display/firsttime/pageList_editableStatements.n3 b/webapp/rdf/display/firsttime/pageList_editableStatements.n3
index 8ad74fa87..23587e53a 100644
--- a/webapp/rdf/display/firsttime/pageList_editableStatements.n3
+++ b/webapp/rdf/display/firsttime/pageList_editableStatements.n3
@@ -18,6 +18,7 @@ display:pageListPage
 display:pageListData
     a <java:edu.cornell.mannlib.vitro.webapp.utils.dataGetter.SparqlQueryDataGetter>;                       
     display:saveToVar "pages" ;
+    display:queryModel <vitro:requestDisplayModel> ; 
     display:query """
     PREFIX display: <http://vitro.mannlib.cornell.edu/ontologies/display/1.1#> 
     PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
diff --git a/webapp/web/templates/freemarker/lib/lib-properties.ftl b/webapp/web/templates/freemarker/lib/lib-properties.ftl
index 06cd3b250..977776524 100644
--- a/webapp/web/templates/freemarker/lib/lib-properties.ftl
+++ b/webapp/web/templates/freemarker/lib/lib-properties.ftl
@@ -249,7 +249,7 @@ name will be used as the label. -->
     ${label.value}
     <#if useEditLink>
     	<@editingLinks "label" "" label editable />
-    <#elseif editable || (languageCount > 1)>
+    <#elseif (editable && (labelCount > 0)) || (languageCount > 1)>
     	<#--We display the link even when the user is not logged in case of multiple labels with different languages-->
     	<#assign labelLink = ""/>
     	<#-- Manage labels now goes to generator -->
@@ -274,7 +274,7 @@ name will be used as the label. -->
     	
         <span class="inline">
             <a class="add-label" href="${labelLink}"
-             title="${linkTitle}">${individualProfileUrl} -> ${profileParameters} -> ${extraParameters}
+             title="${linkTitle}">
         	<img class="add-individual" src="${urls.images}/individual/manage-icon.png" alt="${imageAlt}" /></a>
         </span>
     </#if>