Fixes #30, #31, #32 and minor usability fixes for search