Search

Mostly fixes #36 and #53  Doesn't do content searching because it is problematic. 

Also is good for #61