#54 Simplify search

Easy to build, but makes the experience for users so much better!