Adding search config fix and users rename fix.
Merge pull request #449 from scrollback/refactor-fix

Adding search config fix and users rename fix.