Raw search

Code for #143 I've been using it in development seems to work fine.

Let me know if it is ok for you :)