diff --git a/docs/changelog/6.x.x.txt b/docs/changelog/6.x.x.txt
index d2b760499..6c3861dc0 100644
--- a/docs/changelog/6.x.x.txt
+++ b/docs/changelog/6.x.x.txt
@@ -21,6 +21,7 @@
        [ 1149801 ] page position not maintained (Martin Kamerbeek)
  - fix [ 1165373 ] sort templates into folders by namespace under ImportNode
  - fix [ 1118789 ] 6.2.11 - L_loginBox display with empty 1st param [colink]
+ - fix [ 1165635 ] IndexedSearch - double toolbar in AdminMode [mwilson]
 
 
 6.5.2
diff --git a/docs/upgrades/upgrade_6.2.11-6.3.0.pl b/docs/upgrades/upgrade_6.2.11-6.3.0.pl
index 4e21c2bf0..cc265a752 100644
--- a/docs/upgrades/upgrade_6.2.11-6.3.0.pl
+++ b/docs/upgrades/upgrade_6.2.11-6.3.0.pl
@@ -90,7 +90,7 @@ WebGUI::SQL->write("delete from settings where name in ('siteicon','favicon')");
 print "\tMigrating wobject templates to asset templates.\n" unless ($quiet);
 my $sth = WebGUI::SQL->read("select templateId, template, namespace from template where namespace in ('Article', 
 		'SyndicatedContent', 'MessageBoard', 'DataForm', 'HttpProxy', 'Poll', 'Product', 'WobjectProxy',
-		'IndexedSearch', 'SQLReport', 'Survey', 'WSClient')");
+		'SQLReport', 'Survey', 'WSClient')");
 while (my $t = $sth->hashRef) {
 	$t->{template} = '<a name="<tmpl_var assetId>"></a>
 <tmpl_if session.var.adminOn>
diff --git a/docs/upgrades/upgrade_6.5.2-6.5.3.pl b/docs/upgrades/upgrade_6.5.2-6.5.3.pl
index 50f90ad3d..9ea0513ae 100644
--- a/docs/upgrades/upgrade_6.5.2-6.5.3.pl
+++ b/docs/upgrades/upgrade_6.5.2-6.5.3.pl
@@ -40,7 +40,8 @@ while (my $namespace = $sth->hashRef) {
 		styleTemplateId=>'PBtmpl0000000000000060',
 		printableStyleTemplateId=>'PBtmpl0000000000000111',
 		groupIdView=>'4',
-		groupIdEdit=>'3'
+		groupIdEdit=>'3',
+		description=>''
 	});
 	my $templatesquery = "select * from asset, template where asset.parentId='".$templateFolder."' and asset.assetId=template.assetId and asset.className='WebGUI::Asset::Template' and template.namespace='".$namespace->{namespace}."' order by title asc";
 	my $newParentId = $folder->getId;
@@ -58,6 +59,10 @@ while (my $namespace = $sth->hashRef) {
 }
 $sth->finish;
 
+#Lock down permissions on viewing templates.  There's no reason "everyone"
+#should be allowed to view them if the www_view method returns the parent 
+#container anyway...!
+WebGUI::SQL->write("update asset set groupIdView='4' where className='WebGUI::Asset::Template'");
 
 WebGUI::Session::close();