diff --git a/etemplate/js/et2_extension_nextmatch.js b/etemplate/js/et2_extension_nextmatch.js
index 8e218428e1..bbdaf2fa54 100644
--- a/etemplate/js/et2_extension_nextmatch.js
+++ b/etemplate/js/et2_extension_nextmatch.js
@@ -13,9 +13,6 @@
 "use strict";
 
 /*egw:uses
-	// Force some base libraries to be loaded
-	jquery.jquery;
-	/phpgwapi/egw_json.js;
 
 	// Include the action system
 	egw_action.egw_action;
diff --git a/etemplate/js/et2_widget_itempicker.js b/etemplate/js/et2_widget_itempicker.js
index 84898e619d..a869942e77 100755
--- a/etemplate/js/et2_widget_itempicker.js
+++ b/etemplate/js/et2_widget_itempicker.js
@@ -238,12 +238,11 @@ var et2_itempicker = et2_inputWidget.extend(
 
 		this.itemlist.addClass("loading");
 		this.clear.css("display", "inline-block");
-		var request = new egw_json_request("etemplate_widget_itempicker::ajax_item_search::etemplate", 
+		egw._json("etemplate_widget_itempicker::ajax_item_search::etemplate", 
 			[this.current_app, '', request.term, request.options],
-			this
-		);
-		
-		request.sendRequest(true, this.queryResults, this);
+			this.queryResults,
+			this,true,this
+		).sendRequest();
 	},
 	
 	/**
diff --git a/etemplate/js/etemplate2.js b/etemplate/js/etemplate2.js
index a9903254d7..f76d542ed4 100644
--- a/etemplate/js/etemplate2.js
+++ b/etemplate/js/etemplate2.js
@@ -367,7 +367,7 @@ etemplate2.prototype.submit = function(button)
 		}
 
 		// Create the request object
-		if (typeof egw_json_request != "undefined" && this.menuaction)
+		if (this.menuaction)
 		{
 			var api = this.widgetContainer.egw();
 			var request = api.json(this.menuaction, [this.etemplate_exec_id,values], null, this);
@@ -375,7 +375,7 @@ etemplate2.prototype.submit = function(button)
 		}
 		else
 		{
-			egw.debug("info", "Form got submitted with values: ", values);
+			this.widgetContainer.egw().debug("warn", "Missing menuaction for submit.  Values: ", values);
 		}
 	}
 };