Search Polishing

Get search working more like we'd expect it to on the finished product.

This will address issues from #65 and #95