Move `city_name` from `Indicator` to `IndicatorJob`