diff -uNr a/logotron/MANIFEST.TXT b/logotron/MANIFEST.TXT
--- a/logotron/MANIFEST.TXT 26d2049579dcd28d250b14db6dcdd9c979af1da5a468130bdad63962cbb916172b23bdda6b41411598a4977a62bb9d1c8dc62d8de4d1b24d3e27b324ca9a254e
+++ b/logotron/MANIFEST.TXT 2e4d375892db18ce0f42b30381993c7a70f119542a581b3b20211a3a7f373512c23b832a545a730f86b86143d562e3c383bbe2dd960de617127cc9220437dc1c
@@ -13,3 +13,4 @@
 597604  active_disconnect   bvt             "Close current connection before opening a new one. Disable Nagle's algorithm. s/Listen/Receive/."
 597688  sept_errata         asciilifeform   "Fixed coarse mistake in reader.py"
 597858  detect_disconnect   asciilifeform   "Adjustable detector of bot disconnection."
+598372  shlex_removal       asciilifeform   "Reverted defective attempt at double-quoted search."
diff -uNr a/logotron/reader.py b/logotron/reader.py
--- a/logotron/reader.py 02094c29071dd57d190922d14909d064afdecda6f03288d7f80887f87b189c6cf9f708bc271da3e9e0cb26d1a5345cb93518f3d9edbcacda6ea8a451929bd8e9
+++ b/logotron/reader.py c9a1cb11f1bca0d8ee8f1351f0e2ad9aea8d6e33d5915372854df0352563fff72d867002d17e0fd5a1a9475066eec9078c20c3bdb5b81009456ac44290bf2660
@@ -15,7 +15,6 @@
 import os
 import threading
 import re
-import shlex
 from datetime import datetime
 from urlparse import urljoin
 from flask import Flask, request, session, url_for, redirect, Response, \
@@ -475,7 +474,7 @@
     # Forbid query that is too short:
     if len(query) >= Min_Query_Length:
         # Get the search tokens to use:
-        tokens = shlex.split(query)
+        tokens = query.split()
         tokens_standard = []
         from_users = []