Use the right analyzer when searching (bug 930614)

See also commit 89454ac.