diff --git a/search2/search/fields/FolderField.inc.php b/search2/search/fields/FolderField.inc.php
index 65f2456..16389bb 100755
--- a/search2/search/fields/FolderField.inc.php
+++ b/search2/search/fields/FolderField.inc.php
@@ -43,7 +43,8 @@ class FolderField extends DBFieldExpr
     {
         parent::__construct('full_path', 'documents', _kt('Folder'));
         $this->setAlias('Folder');
-        $this->isValueQuoted(false);
+        // do want values quoted for folder db search
+        /*$this->isValueQuoted(false);*/
     }
 
     public function getInputRequirements()
@@ -59,14 +60,17 @@ class FolderField extends DBFieldExpr
     public function modifyName($sql)
     {
     	$this->path = $sql;
-   		return "case when position('/' in $sql) = 0 then '/' else reverse(substring(reverse($sql) from position('/' in reverse($sql)) + 1 )) end";
+   		return "case when position('/' in $sql) = 0 then '/' "
+             . "else reverse(substring(reverse($sql) from position('/' in reverse($sql)) + 1 )) end";
     }
 
-
+    // do not want to modify the value for a folder search
+    /*
     public function modifyValue($value)
     {
     	return "case when position('/' in $this->path) = 0 then '/' else '$value' end";
     }
+    */
 
 }
 
diff --git a/sql/mysql/upgrade/3.6.1/search_ranking.sql b/sql/mysql/upgrade/3.6.1/search_ranking.sql
index a994084..f0e3db6 100644
--- a/sql/mysql/upgrade/3.6.1/search_ranking.sql
+++ b/sql/mysql/upgrade/3.6.1/search_ranking.sql
@@ -1,29 +1,2 @@
-CREATE TABLE `search_ranking` (
-	`groupname` varchar(100) NOT NULL,
-	`itemname` varchar(100) NOT NULL,
-	`ranking` float default '0',
-	`type` enum('T','M','S') default 'T' COMMENT 'T=Table, M=Metadata, S=Searchable',
-	PRIMARY KEY  (`groupname`,`itemname`)
-) ENGINE=innodb DEFAULT CHARSET=utf8;
-
-
-INSERT INTO `search_ranking` VALUES
-    ('Discussion','',150,'S'),
-    ('documents','checked_out_user_id',1,'T'),
-    ('documents','created',1,'T'),
-    ('documents','creator_id',1,'T'),
-    ('documents','id',1,'T'),
-    ('documents','immutable',1,'T'),
-    ('documents','is_checked_out',1,'T'),
-    ('documents','modified',1,'T'),
-    ('documents','modified_user_id',1,'T'),
-    ('documents','title',300,'T'),
-    ('DocumentText','',100,'S'),
-    ('document_content_version','filename',10,'T'),
-    ('document_content_version','filesize',1,'T'),
-    ('document_fields_link','value',1,'T'),
-    ('document_metadata_version','document_type_id',1,'T'),
-    ('document_metadata_version','name',300,'T'),
-    ('document_metadata_version','workflow_id',1,'T'),
-    ('document_metadata_version','workflow_state_id',1,'T'),
-    ('tag_words','tag',1,'T');
\ No newline at end of file
+UPDATE `search_ranking` SET ranking = 300 WHERE groupname = 'document_metadata_version' AND itemname = 'name';
+INSERT INTO `search_ranking` VALUES ('document_fields_link','value',1,'T');
\ No newline at end of file