fixing locale and json support