Sync with working dev location picker