Search fixes

- Fixed #2928
- Misc fixes

review: @devoncarew

The Style Guide specifically discourages variable-getter-setter triplets in cases where getter/setter don't do anything special. Just use a public member variable.