fixed location issue,
fixed locale selection