Adding search config fix and users rename fix.