Adding locales and fixing handler bug