diff --git a/README b/README
index e46234c..9229aaa 100644
--- a/README
+++ b/README
@@ -83,8 +83,8 @@ NOTES
 
        When  multiple  directories  match  all queries, z will cd to the shortest
        matching directory, without regard to priority. This has been  in  effect,
-       if  undocumented, for quite some time, and it is the opinion of the author
-       that it is intuitive behavior.
+       if  undocumented, for quite some time, but should probably be configurable
+       or reconsidered.
 
        Tab Completion
 
diff --git a/z.1 b/z.1
index 96bd071..c002146 100644
--- a/z.1
+++ b/z.1
@@ -86,8 +86,8 @@ Frecency is determined at runtime.
 .P
 When multiple directories match all queries, \fBz\fR will cd to the shortest
 matching directory, without regard to priority. This has been in effect, if
-undocumented, for quite some time, and it is the opinion of the author that it
-is intuitive behavior.
+undocumented, for quite some time, but should probably be configurable or
+reconsidered.
 .br
 
 \fBTab Completion\fR
diff --git a/z.sh b/z.sh
index d51c543..cef3d73 100755
--- a/z.sh
+++ b/z.sh
@@ -106,10 +106,8 @@ _z() {
   # no file yet
   [ -f "$datafile" ] || return
 
-  local tempfile
-  tempfile="$(mktemp $datafile.XXXXXX)" || return
   local cd
-  cd="$(awk -v t="$(date +%s)" -v list="$list" -v typ="$typ" -v q="$fnd" -v tmpfl="$tempfile" -F"|" '
+  cd="$(awk -v t="$(date +%s)" -v list="$list" -v typ="$typ" -v q="$fnd" -F"|" '
    function frecent(rank, time) {
     dx = t-time
     if( dx < 3600 ) return rank*4
@@ -134,17 +132,11 @@ _z() {
      if( matches[i] && (!short || length(i) < length(short)) ) short = i
     }
     if( short == "/" ) return
-    for( i in matches ) if( matches[i] && i !~ short ) x = 1
-    if( x ) return
-    if( nc ) {
-     for( i in fnd ) if( tolower(short) !~ tolower(fnd[i]) ) x = 1
-    } else for( i in fnd ) if( short !~ fnd[i] ) x = 1
-    if( !x ) return short
+    return short
    }
    BEGIN { split(q, a, " ") }
    {
     if( system("test -d \"" $1 "\"") ) next
-    print $0 >> tmpfl
     if( typ == "rank" ) {
      f = $2
     } else if( typ == "recent" ) {
@@ -169,12 +161,8 @@ _z() {
     } else if( ncx ) output(nocase, ncx, common(nocase, a, 1))
    }
   ' "$datafile")"
-  if [ $? -gt 0 ]; then
-   env rm -f "$tempfile"
-  else
-   env mv -f "$tempfile" "$datafile"
-   [ "$cd" ] && cd "$cd"
-  fi
+  [ $? -gt 0 ] && return
+  [ "$cd" ] && cd "$cd"
  fi
 }