An effort to fix the Select a data layer location issue