Search fixes

- Fixed #2928
- Misc fixes

review: @devoncarew

Style Guide: "DO use spaces around binary and ternary operators, after commas, and not around unary operators."