diff --git a/chrome/content/zotero/bindings/searchtextbox.xml b/chrome/content/zotero/bindings/searchtextbox.xml
index bbdd3bcd3c..2bd94654ae 100644
--- a/chrome/content/zotero/bindings/searchtextbox.xml
+++ b/chrome/content/zotero/bindings/searchtextbox.xml
@@ -195,10 +195,11 @@
 						var menulist = document.getAnonymousNodes(this)[0].firstChild.nextSibling;
 						var menupopup = menulist.firstChild;
 						
+						var selectThis = 0;
 						for (var i=0; i<menupopup.childNodes.length; i++){
 							if (menupopup.childNodes[i].value == units)
 							{
-								var selectThis = i;
+								selectThis = i;
 								break;
 							}
 						}
diff --git a/chrome/content/zotero/bindings/zoterosearch.xml b/chrome/content/zotero/bindings/zoterosearch.xml
index 06fa306dc4..ee8fc61fc8 100644
--- a/chrome/content/zotero/bindings/zoterosearch.xml
+++ b/chrome/content/zotero/bindings/zoterosearch.xml
@@ -287,7 +287,6 @@
 							{
 								// If switching from menu to textbox, clear value
 								if (this.id('valuefield').hidden){
-									this.value = '';
 									this.id('valuefield').value = '';
 								}
 								// If switching between textbox conditions, get loaded value for new one
@@ -321,6 +320,10 @@
 					// Textbox + units dropdown for isInTheLast operator
 					else if (operatorsList.value=='isInTheLast')
 					{
+						// If switching from text field, clear value
+						if (this.id('value-date-age').hidden){
+							this.value = '';
+						}
 						this.id('valuefield').hidden = true;
 						this.id('valuemenu').hidden = true;
 						this.id('value-date-age').hidden = false;
@@ -329,7 +332,8 @@
 					// Textbox
 					else
 					{
-						if (!this.id('value-date-age').hidden){
+						// If switching from date age, clear value
+						if (this.id('valuefield').hidden){
 							this.value = '';
 						}
 						this.id('valuefield').hidden = false;