Fix template relying on old user-plucked variables