Change rtd_location_id to allow no location set