[OnDemand] list tweak.