diff --git a/etemplate/js/et2_core_common.js b/etemplate/js/et2_core_common.js
index e6ac308e90..1c6dba6fcc 100644
--- a/etemplate/js/et2_core_common.js
+++ b/etemplate/js/et2_core_common.js
@@ -231,7 +231,6 @@ function et2_validateAttrib(_id, _attrib)
 		_attrib["name"] = _id;
 		egw.debug("log", "Human name ('name'-Field) for attribute '" +
 			_id + "' has not been supplied, set to '" + _id + "'");
-console.debug(_attrib);
 	}
 
 	if (typeof _attrib["description"] == "undefined")
diff --git a/etemplate/js/et2_extension_nextmatch.js b/etemplate/js/et2_extension_nextmatch.js
index 7141346b32..23172d5def 100644
--- a/etemplate/js/et2_extension_nextmatch.js
+++ b/etemplate/js/et2_extension_nextmatch.js
@@ -1291,7 +1291,6 @@ var et2_nextmatch_customfields = et2_customfields_list.extend(et2_INextmatchHead
 			}
 			else if (apps[field.type]) 
 			{
-				// TODO: Figure out why search can't get focus
 				widget = et2_createWidget("nextmatch-entryheader", {
 					id: cf_id,
 					application: field.type,
diff --git a/etemplate/js/et2_widget_link.js b/etemplate/js/et2_widget_link.js
index b979ef58d1..97ddaddef0 100644
--- a/etemplate/js/et2_widget_link.js
+++ b/etemplate/js/et2_widget_link.js
@@ -325,6 +325,7 @@ var et2_link_entry = et2_inputWidget.extend({
 		},
 	},
 
+	legacyOptions: ["application"],
 	search_timeout: 200, //ms after change to send query
 	minimum_characters: 2, // Don't send query unless there's at least this many chars