       try container.encode(id, forKey: .id)
       try container.encode(required, forKey: .required)
       try container.encode(title, forKey: .title)
+      try container.encodeIfPresent(options, forKey: .options)
+      
       try container.encode(type, forKey: .type)
-      try container.encodeIfPresent(options, forKey: .options)
-      
       switch value {
       case .singleSelection(let optionId):
         try container.encode(optionId, forKey: .value)

      case singleSelection = "SINGLE_CHOICE"
      case multipleSelections = "MULTIPLE_CHOICE"
      case requestReturnTrip = "RETURN_TRIP"
    }
    
    public enum ReturnTripDateValue: Hashable {

      case title
      case value
      case values
      case minValue
      case maxValue
    }
    
    public init(from decoder: Decoder) throws {
