diff --git a/forms/TreeDropdownField.php b/forms/TreeDropdownField.php
index 0aef18f96..480f92e69 100644
--- a/forms/TreeDropdownField.php
+++ b/forms/TreeDropdownField.php
@@ -434,27 +434,25 @@ class TreeDropdownField extends FormField {
 			$res = call_user_func($this->searchCallback, $this->sourceObject, $this->labelField, $this->search);
 		} else {
 			$sourceObject = $this->sourceObject;
-			$wheres = array();
+			$filters = array();
 			if(singleton($sourceObject)->hasDatabaseField($this->labelField)) {
-				$wheres[] = "\"$this->labelField\" LIKE '%$this->search%'";
+				$filters["{$this->labelField}:PartialMatch"]  = $this->search;
 			} else {
 				if(singleton($sourceObject)->hasDatabaseField('Title')) {
-					$wheres[] = "\"Title\" LIKE '%$this->search%'";
+					$filters["Title:PartialMatch"] = $this->search;
 				}
 				if(singleton($sourceObject)->hasDatabaseField('Name')) {
-					$wheres[] = "\"Name\" LIKE '%$this->search%'";
+					$filters["Name:PartialMatch"] = $this->search;
 				}
-			} 
-		
-			if(!$wheres) {
+			}
+			if(empty($filters)) {
 				throw new InvalidArgumentException(sprintf(
 					'Cannot query by %s.%s, not a valid database column',
 					$sourceObject,
 					$this->labelField
 				));
 			}
-
-			$res = DataObject::get($this->sourceObject, implode(' OR ', $wheres));
+			$res = DataObject::get($this->sourceObject)->filterAny($filters);
 		}
 		
 		if( $res ) {
@@ -463,15 +461,18 @@ class TreeDropdownField extends FormField {
 				if ($row->ParentID) $parents[$row->ParentID] = true;
 				$this->searchIds[$row->ID] = true;
 			}
+			
+			$sourceObject = $this->sourceObject;
+			
 			while (!empty($parents)) {
-				$res = DB::query('SELECT "ParentID", "ID" FROM "' . $this->sourceObject
-					. '" WHERE "ID" in ('.implode(',',array_keys($parents)).')');
+				$items = $sourceObject::get()
+					->filter("ID",array_keys($parents));
 				$parents = array();
 
-				foreach($res as $row) {
-					if ($row['ParentID']) $parents[$row['ParentID']] = true;
-					$this->searchIds[$row['ID']] = true;
-					$this->searchExpanded[$row['ID']] = true;
+				foreach($items as $item) {
+					if ($item->ParentID) $parents[$item->ParentID] = true;
+					$this->searchIds[$item->ID] = true;
+					$this->searchExpanded[$item->ID] = true;
 				}
 			}
 		}
diff --git a/tests/forms/TreeDropdownFieldTest.php b/tests/forms/TreeDropdownFieldTest.php
new file mode 100644
index 000000000..125bee465
--- /dev/null
+++ b/tests/forms/TreeDropdownFieldTest.php
@@ -0,0 +1,107 @@
+<?php
+/**
+ * @package framework
+ * @subpackage tests
+ */
+class TreeDropdownFieldTest extends SapphireTest {
+
+	protected static $fixture_file = 'TreeDropdownFieldTest.yml';
+
+	public function testTreeSearch(){
+
+		$field = new TreeDropdownField('TestTree', 'Test tree', 'Folder');
+
+		// case insensitive search against keyword 'sub' for folders
+		$request = new SS_HTTPRequest('GET','url',array('search'=>'sub'));
+		$tree = $field->tree($request);
+		
+		$folder1 = $this->objFromFixture('Folder','folder1');
+		$folder1Subfolder1 = $this->objFromFixture('Folder','folder1-subfolder1');
+
+		$parser = new CSSContentParser($tree);
+		$cssPath = 'ul.tree li#selector-TestTree-'.$folder1->ID.' li#selector-TestTree-'.$folder1Subfolder1->ID.' a span.item';
+		$firstResult = $parser->getBySelector($cssPath);
+		$this->assertEquals(
+			(string)$firstResult[0], 
+			$folder1Subfolder1->Name, 
+			$folder1Subfolder1->Name.' is found, nested under '.$folder1->Name
+		);
+
+		$subfolder = $this->objFromFixture('Folder','subfolder');
+		$cssPath = 'ul.tree li#selector-TestTree-'.$subfolder->ID.' a span.item';
+		$secondResult = $parser->getBySelector($cssPath);
+		$this->assertEquals(
+			(string)$secondResult[0], 
+			$subfolder->Name, 
+			$subfolder->Name.' is found at root level'
+		);
+
+		// other folders which don't contain the keyword 'sub' are not returned in search results
+		$folder2 = $this->objFromFixture('Folder','folder2');
+		$cssPath = 'ul.tree li#selector-TestTree-'.$folder2->ID.' a span.item';
+		$noResult = $parser->getBySelector($cssPath);
+		$this->assertEquals(
+			$noResult, 
+			array(), 
+			$folder2.' is not found'
+		);
+
+		$field = new TreeDropdownField('TestTree', 'Test tree', 'File');
+
+		// case insensitive search against keyword 'sub' for files
+		$request = new SS_HTTPRequest('GET','url',array('search'=>'sub'));
+		$tree = $field->tree($request);
+
+		$parser = new CSSContentParser($tree);
+
+		// Even if we used File as the source object, folders are still returned because Folder is a File
+		$cssPath = 'ul.tree li#selector-TestTree-'.$folder1->ID.' li#selector-TestTree-'.$folder1Subfolder1->ID.' a span.item';
+		$firstResult = $parser->getBySelector($cssPath);
+		$this->assertEquals(
+			(string)$firstResult[0], 
+			$folder1Subfolder1->Name, 
+			$folder1Subfolder1->Name.' is found, nested under '.$folder1->Name
+		);
+
+		// Looking for two files with 'sub' in their name, both under the same folder
+		$file1 = $this->objFromFixture('File','subfolderfile1');
+		$file2 = $this->objFromFixture('File','subfolderfile2');
+		$cssPath = 'ul.tree li#selector-TestTree-'.$subfolder->ID.' li#selector-TestTree-'.$file1->ID.' a';
+		$firstResult = $parser->getBySelector($cssPath);
+		$this->assertGreaterThan(
+			0, 
+			count($firstResult), 
+			$file1->Name.' with ID '.$file1->ID.' is in search results'
+		);
+		$this->assertEquals(
+			(string)$firstResult[0], 
+			$file1->Name, 
+			$file1->Name.' is found nested under '.$subfolder->Name
+		);
+
+		$cssPath = 'ul.tree li#selector-TestTree-'.$subfolder->ID.' li#selector-TestTree-'.$file2->ID.' a';
+		$secondResult = $parser->getBySelector($cssPath);
+		$this->assertGreaterThan(
+			0,
+			count($secondResult), 
+			$file2->Name.' with ID '.$file2->ID.' is in search results'
+		);
+		$this->assertEquals(
+			(string)$secondResult[0], 
+			$file2->Name, 
+			$file2->Name.' is found nested under '.$subfolder->Name
+		);
+
+		// other files which don't include 'sub' are not returned in search results
+		$file3 = $this->objFromFixture('File','asdf');
+		$cssPath = 'ul.tree li#selector-TestTree-'.$file3->ID;
+		$noResult = $parser->getBySelector($cssPath);
+		$this->assertEquals(
+			$noResult, 
+			array(), 
+			$file3->Name.' is not found'
+		);
+	}
+
+}
+	
\ No newline at end of file
diff --git a/tests/forms/TreeDropdownFieldTest.yml b/tests/forms/TreeDropdownFieldTest.yml
new file mode 100644
index 000000000..0e77af985
--- /dev/null
+++ b/tests/forms/TreeDropdownFieldTest.yml
@@ -0,0 +1,25 @@
+Folder:
+  subfolder:
+    Name: FileTest-subfolder
+  folder1:
+    Name: FileTest-folder1
+  folder2:
+    Name: FileTest-folder2
+  folder1-subfolder1:
+    Name: FileTest-folder1-subfolder1
+    ParentID: =>Folder.folder1
+File:
+  asdf:
+    Filename: assets/FileTest.txt
+  subfolderfile1:
+    Filename: assets/FileTest-subfolder/TestFile1InSubfolder.txt
+    Name: TestFile1InSubfolder
+    ParentID: =>Folder.subfolder
+  subfolderfile2:
+    Filename: assets/FileTest-subfolder/TestFile2InSubfolder.txt
+    Name: TestFile2InSubfolder
+    ParentID: =>Folder.subfolder
+  file1-folder1:
+    Filename: assets/FileTest-folder1/File1.txt
+    Name: File1.txt
+    ParentID: =>Folder.folder1
\ No newline at end of file