fieldsToArgList helper now returns Option[String] instead of String