Fix default location selected (now uses allowed locations only)