short_tariff renamed to tariff_override