some update to select locations