fixed tender id issues