Merchant Search and fix bug in user add & edit