diff --git a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treesource.controller.js b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treesource.controller.js
index 3f353a9d4f..87fa2c8724 100644
--- a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treesource.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treesource.controller.js
@@ -5,20 +5,13 @@ angular.module('umbraco')
 	
 	function($scope, dialogService, entityResource, $log, iconHelper){
 
-		if(angular.isObject($scope.model.value)){
-			$scope.model.type = $scope.model.value.type;
-			$scope.model.id = $scope.model.value.id;
-		}else{
-			$scope.model.type = "content";
-		}		
-
-		if($scope.model.id && $scope.model.type !== "member"){
+		if($scope.model.value.id && $scope.model.value.type !== "member"){
 			var ent = "Document";
-			if($scope.model.type === "media"){
+			if($scope.model.value.type === "media"){
 				ent = "Media";
 			}
 			
-			entityResource.getById($scope.model.id, ent).then(function(item){
+			entityResource.getById($scope.model.value.id, ent).then(function(item){
 				item.icon = iconHelper.convertFromLegacyIcon(item.icon);
 				$scope.node = item;
 			});
@@ -27,30 +20,29 @@ angular.module('umbraco')
 
 		$scope.openContentPicker =function(){
 			var d = dialogService.treePicker({
-								section: $scope.model.type,
-								treeAlias: $scope.model.type,
+								section: $scope.model.value.type,
+								treeAlias: $scope.model.value.type,
 								scope: $scope, 
 								multiPicker: false,
 								callback: populate});
 		};
 
 		$scope.clear = function() {
-		    $scope.model.id = undefined;
+		    $scope.model.value.id = undefined;
 		    $scope.node = undefined;
 		};
 		
 	    $scope.$on("formSubmitting", function (ev, args) {
-	    	if($scope.model.type === "member"){
-	    		$scope.model.id = -1;
+	    	if($scope.model.value.type === "member"){
+	    		$scope.model.value.id = -1;
+	    		$scope.model.value.query = "";
 	    	}
-
-			$scope.model.value = {type: $scope.model.type, id: $scope.model.id};
 	    });
 
 		function populate(item){
 				$scope.clear();
 				item.icon = iconHelper.convertFromLegacyIcon(item.icon);
 				$scope.node = item;
-				$scope.model.id = item.id;
+				$scope.model.value.id = item.id;
 		}
 });
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treesource.html b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treesource.html
index 370a2c8cd6..bc5f5f8158 100644
--- a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treesource.html
+++ b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treesource.html
@@ -1,6 +1,6 @@
 <div ng-controller="Umbraco.PrevalueEditors.TreeSourceController" class="umb-editor umb-contentpicker">
 
-	<select ng-model="model.type">
+	<select ng-model="model.value.type">
 		<option value="content">Content</option>
 		<option value="media">Media</option>
 		<option value="member">Members</option>
@@ -8,7 +8,7 @@
 
 	<br/><br/>
 
-	<div ng-hide="model.type === 'member'">
+	<div ng-hide="model.value.type === 'member'">
 		<ul class="unstyled list-icons" ng-if="node" >	
 			<li>	
 				<i class="icon icon-delete red hover-show pull-right" ng-click="clear()"></i>
@@ -18,12 +18,27 @@
 		</ul>
 
 		<ul class="unstyled list-icons" ng-show="multipicker || !node">	
-			<li>
+			<li ng-hide="showSearch">
 				<i class="icon icon-add blue"></i>
 				<a href ng-click="openContentPicker()" prevent-default>
 					<localize key="general_choose">Choose</localize>...
 				</a>
+<!--
+				<a href ng-click="showSearch = true"> Or search</a>-->
+			</li>
+
+			<li ng-show="showSearch">
+				<input type="text" 
+					ng-model="model.value.query" 
+					class="umb-textstring" 
+					placeholder="Enter query">
+
+					<input type="radio" ng-model="model.value.scope" value="global"> Global 	
+					<input type="radio" ng-model="model.value.scope" value="current"> Current
+					<a href ng-click="showSearch = false"> ...Or pick a node</a>
 			</li>
 		</ul>
 	</div>
+
+	{{model | json}}
 </div>
\ No newline at end of file