Search simplification patch

Hello Marco,

I'm not very good with this git stuff, but I forked from your repo, and commited a patch to my branch. Test results are promising so far.

I don't know if this "pull request" thing is the way to do it: we'll see!

Lucas