Update for new flags in OTT 2.2 and new TNRS id features