Made the search smarter
Prepared to release 0.0.19.