Better handling of location list and updates