LocaleProvider and minor changes in controller logic