diff --git a/ChangeLog b/ChangeLog
index e4f8a96b8..fe6e67e57 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -18,7 +18,7 @@ $Source$
 	* tbl_select.php3:
 	  - the script to returns to was hard coded, now it's the one that calls
 	    tbl_select.php3;
-	  - ensure the "null" string can be used in the "value" box.
+	  - ensure the "null"/"not null" strings can be used in the "value" box.
 	* tbl_copy.php3; tbl_properties.php3: re-enabled the ability to copy a
 	  table to another database (bug #456434). Need to be tested with
 	  MySQL < 3.23 releases.
diff --git a/tbl_select.php3 b/tbl_select.php3
index a96357cea..cd9661265 100755
--- a/tbl_select.php3
+++ b/tbl_select.php3
@@ -70,7 +70,7 @@ if (!isset($param) || $param[0] == '') {
             echo "\n";
             $bgcolor   = ($i % 2) ? $cfgBgcolorOne : $cfgBgcolorTwo;
             $fieldsize = (($fields_len[$i] > 40) ? 40 : $fields_len[$i]);
-            $maxlength = (($fields_len[$i] < 4)  ? 4  : $fields_len[$i]);
+            $maxlength = (($fields_len[$i] < 8)  ? 8  : $fields_len[$i]);
             ?>
             <tr bgcolor="<?php echo $bgcolor; ?>">
                 <td><?php echo htmlspecialchars($fields_list[$i]); ?></td>
@@ -140,7 +140,7 @@ else {
         $sql_query .= ' WHERE 1';
         for ($i = 0; $i < count($fields); $i++) {
             if (!empty($fields) && $fields[$i] != '') {
-                if (strtoupper($fields[$i]) == 'NULL') {
+                if (strtoupper($fields[$i]) == 'NULL' || strtoupper($fields[$i]) == 'NOT NULL') {
                     $quot = '';
                     $cmp  = 'IS';
                 }