diff --git a/adminer/functions.js b/adminer/functions.js
index 164797c7..f7e6980e 100644
--- a/adminer/functions.js
+++ b/adminer/functions.js
@@ -44,15 +44,6 @@ function form_uncheck(id) {
 
 
 
-function where_change(op) {
-	for (var i=0; i < op.form.elements.length; i++) {
-		var el = op.form.elements[i];
-		if (el.name == op.name.substr(0, op.name.length - 4) + '[val]') {
-			el.className = (/NULL$/.test(op.options[op.selectedIndex].text) ? 'hidden' : '');
-		}
-	}
-}
-
 function select_add_row(field) {
 	var row = field.parentNode.cloneNode(true);
 	var selects = row.getElementsByTagName('select');
diff --git a/adminer/select.inc.php b/adminer/select.inc.php
index d1c90cf8..e54b4f28 100644
--- a/adminer/select.inc.php
+++ b/adminer/select.inc.php
@@ -43,7 +43,7 @@ foreach ((array) $_GET["where"] as $val) {
 			$where[] = "MATCH (" . idf_escape($val["col"]) . ") AGAINST (" . $dbh->quote($val["val"]) . " IN BOOLEAN MODE)";
 		} else {
 			$in = process_length($val["val"]);
-			$cond = " $val[op]" . (ereg('NULL$', $val["op"]) ? "" : (ereg('IN$', $val["op"]) ? " (" . (strlen($in) ? $in : "NULL") . ")" : " " . $dbh->quote($val["val"]))); //! this searches in numeric values too
+			$cond = " $val[op]" . (ereg('NULL$', $val["op"]) ? "" : (ereg('IN$', $val["op"]) ? " (" . (strlen($in) ? $in : "NULL") . ")" : " " . $dbh->quote($val["val"])));
 			if (strlen($val["col"])) {
 				$where[] = idf_escape($val["col"]) . $cond;
 			} else {
@@ -189,13 +189,13 @@ if (!$columns) {
 	foreach ((array) $_GET["where"] as $val) {
 		if (strlen("$val[col]$val[val]") && in_array($val["op"], $operators)) {
 			echo "<div><select name='where[$i][col]'><option value=''>" . lang('(anywhere)') . "</option>" . optionlist($columns, $val["col"]) . "</select>";
-			echo "<select name='where[$i][op]' onchange='where_change(this);'>" . optionlist($operators, $val["op"]) . "</select>";
-			echo "<input name='where[$i][val]' value=\"" . htmlspecialchars($val["val"]) . '"' . (ereg('NULL$', $val["op"]) ? " class='hidden'" : "") . " /></div>\n";
+			echo "<select name='where[$i][op]'>" . optionlist($operators, $val["op"]) . "</select>";
+			echo "<input name='where[$i][val]' value=\"" . htmlspecialchars($val["val"]) . "\" /></div>\n";
 			$i++;
 		}
 	}
 	echo "<div><select name='where[$i][col]' onchange='select_add_row(this);'><option value=''>" . lang('(anywhere)') . "</option>" . optionlist($columns) . "</select>";
-	echo "<select name='where[$i][op]' onchange='where_change(this);'>" . optionlist($operators) . "</select>";
+	echo "<select name='where[$i][op]'>" . optionlist($operators) . "</select>";
 	echo "<input name='where[$i][val]' /></div>\n";
 	echo "</div></fieldset>\n";