diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ab9d55427..7dca0dc89 100755
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
 2009-01-19  Carsten Dominik  <carsten.dominik@gmail.com>
 
+	* org.el (org-make-tags-matcher): Never use IDO for completing the
+	tags matcher match string.
+	(org-completing-read): Also remove the special biding for "?".
+
 	* org-attach.el (org-attach-allow-inheritance): New option.
 	(org-attach-inherited): New variable.
 	(org-attach-dir): Handle properties related to the attachment
diff --git a/lisp/org.el b/lisp/org.el
index c104e3878..a97751e2f 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -6830,6 +6830,7 @@ used as the link location instead of reading one interactively."
   (let ((minibuffer-local-completion-map
 	 (copy-keymap minibuffer-local-completion-map)))
     (org-defkey minibuffer-local-completion-map " " 'self-insert-command)
+    (org-defkey minibuffer-local-completion-map "?" 'self-insert-command)
     (apply 'org-ido-completing-read args)))
 
 (defun org-ido-completing-read (&rest args)
@@ -9445,7 +9446,7 @@ also TODO lines."
     ;; Get a new match request, with completion
     (let ((org-last-tags-completion-table
 	   (org-global-tags-completion-table)))
-      (setq match (org-ido-completing-read
+      (setq match (org-completing-read
 		   "Match: " 'org-tags-completion-function nil nil nil
 		   'org-tags-history))))