Changed internal handling of the list of locations