fix locales, add dates scope
merge