Client side I18n couple of bugs fixed