corrected field conditionality to support more protocol options