diff --git a/app/controllers/concerns/correspondence_controller_concern.rb b/app/controllers/concerns/correspondence_controller_concern.rb
index 34f28e884b5..8b6148ffe9b 100644
--- a/app/controllers/concerns/correspondence_controller_concern.rb
+++ b/app/controllers/concerns/correspondence_controller_concern.rb
@@ -130,7 +130,7 @@ def build_multi_error_message(errors, action_prefix)
   end
 
   def error_reason(error)
-    return "" unless error
+    return "" unless error.is_a?(String)
 
     case error
     when Constants.CORRESPONDENCE_AUTO_ASSIGN_ERROR.NOD_ERROR then "of NOD permissions settings"
@@ -148,7 +148,7 @@ def build_single_error_message(action_prefix, reason)
   def build_error_message(*args)
     # Build error message for multiple correspondence based on error types
     message = "#{args[0]} cases were not #{args[1]}assigned to user"
-    message = "• #{message}" if use_bullet
+    message = "• #{message}" if args[3].present?
     message += " because #{args[2]}." unless args[0].zero?
     message
   end
diff --git a/app/models/user.rb b/app/models/user.rb
index 8c46838d1e8..fe4bf14f3db 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -98,7 +98,7 @@ def hearings_user?
   end
 
   def inbound_ops_team_superuser?
-    return false unless FeatureToggle.enabled?(:correspondence_queue)
+    return false unless correspondence_queue_enabled?
 
     member_of_organization?(InboundOpsTeam.singleton) &&
       OrganizationUserPermissionChecker.new.can?(
@@ -110,14 +110,14 @@ def inbound_ops_team_superuser?
 
   # check for user that is not an admin of the inbound ops team
   def inbound_ops_team_user?
-    return false unless FeatureToggle.enabled?(:correspondence_queue)
+    return false unless correspondence_queue_enabled?
 
     organizations.include?(InboundOpsTeam.singleton) &&
       !inbound_ops_team_supervisor?
   end
 
   def inbound_ops_team_supervisor?
-    return false unless FeatureToggle.enabled?(:correspondence_queue)
+    return false unless correspondence_queue_enabled?
 
     administered_teams.include?(InboundOpsTeam.singleton)
   end
@@ -591,6 +591,10 @@ def system_user?
 
   private
 
+  def correspondence_queue_enabled?
+    FeatureToggle.enabled?(:correspondence_queue)
+  end
+
   def inactive_judge_team
     JudgeTeam.unscoped.inactive.find_by(id: organizations_users.admin.pluck(:organization_id))
   end
diff --git a/client/app/components/RadioField.jsx b/client/app/components/RadioField.jsx
index 2775bda6282..71f3cc7a0e7 100644
--- a/client/app/components/RadioField.jsx
+++ b/client/app/components/RadioField.jsx
@@ -4,9 +4,10 @@ import classNames from 'classnames';
 
 import RequiredIndicator from './RequiredIndicator';
 import StringUtil from '../util/StringUtil';
-import Tooltip from './Tooltip';
+import MaybeAddTooltip from './TooltipHelper';
 
-import ACD_LEVERS from '../../constants/ACD_LEVERS';
+import RadioInput from './RadioInput';
+import { extractFieldProps } from './fieldUtils';
 
 import { helpText } from './RadioField.module.scss';
 
@@ -29,11 +30,9 @@ RadioFieldHelpText.propTypes = {
  */
 
 export const RadioField = (props) => {
+
+  const { id, className, label, inputRef } = extractFieldProps(props);
   const {
-    id,
-    className,
-    label,
-    inputRef,
     inputProps,
     name,
     options,
@@ -68,25 +67,6 @@ export const RadioField = (props) => {
     </span>
   );
 
-  const maybeAddTooltip = (option, radioField) => {
-    if (option.tooltipText) {
-      const keyId = `tooltip-${option.value}`;
-
-      return <Tooltip
-        key={keyId}
-        id={keyId}
-        text={option.tooltipText}
-        position="right"
-        className="cf-radio-option-tooltip"
-        offset={{ right: 15 }}
-      >
-        {radioField}
-      </Tooltip>;
-    }
-
-    return radioField;
-  };
-
   const isDisabled = (option) => Boolean(option.disabled);
 
   const handleChange = (event) => onChange?.(event.target.value);
@@ -109,17 +89,15 @@ export const RadioField = (props) => {
             className="cf-form-radio-option"
             key={`${idPart}-${option.value}-${i}`}
           >
-            <input
-              onChange={handleChange}
+            <RadioInput
+              handleChange={handleChange}
               name={name}
-              type={ACD_LEVERS.data_types.radio}
-              id={`${idPart}_${option.value}`}
-              value={option.value}
-              // eslint-disable-next-line no-undefined
-              checked={controlled ? value === option.value : undefined}
-              disabled={optionDisabled}
-              ref={inputRef}
-              {...inputProps}
+              idPart={idPart}
+              option={option}
+              controlled={controlled}
+              value={value}
+              inputRef={inputRef}
+              inputProps={inputProps}
             />
             <label
               className={optionDisabled ? 'disabled' : ''}
@@ -131,7 +109,11 @@ export const RadioField = (props) => {
           </div>
           );
 
-          return maybeAddTooltip(option, radioField);
+          return (
+            <MaybeAddTooltip key={option.value} option={option}>
+              {radioField}
+            </MaybeAddTooltip>
+          );
         })}
       </div>
     </fieldset>
diff --git a/client/app/components/RadioFieldWithChildren.jsx b/client/app/components/RadioFieldWithChildren.jsx
index 364de603286..2799f4fd097 100644
--- a/client/app/components/RadioFieldWithChildren.jsx
+++ b/client/app/components/RadioFieldWithChildren.jsx
@@ -4,9 +4,10 @@ import classNames from 'classnames';
 
 import RequiredIndicator from './RequiredIndicator';
 import StringUtil from '../util/StringUtil';
-import Tooltip from './Tooltip';
+import MaybeAddTooltip from './TooltipHelper';
 
-import ACD_LEVERS from '../../constants/ACD_LEVERS';
+import RadioInput from './RadioInput';
+import { extractFieldProps } from './fieldUtils';
 
 import { helpText } from './RadioField.module.scss';
 const RadioFieldHelpText = ({ help, className }) => {
@@ -31,11 +32,9 @@ RadioFieldHelpText.propTypes = {
 
 export const RadioFieldWithChildren = (props) => {
 
+  const { id, className, label, inputRef } = extractFieldProps(props);
+
   const {
-    id,
-    className,
-    label,
-    inputRef,
     inputProps,
     name,
     options,
@@ -70,25 +69,6 @@ export const RadioFieldWithChildren = (props) => {
     </span>
   );
 
-  const maybeAddTooltip = (option, radioField) => {
-    if (option.tooltipText) {
-      const keyId = `tooltip-${option.value}`;
-
-      return <Tooltip
-        key={keyId}
-        id={keyId}
-        text={option.tooltipText}
-        position="right"
-        className="cf-radio-option-tooltip"
-        offset={{ right: 15 }}
-      >
-        {radioField}
-      </Tooltip>;
-    }
-
-    return radioField;
-  };
-
   const isDisabled = (option) => Boolean(option.disabled);
 
   const handleChange = (event) => onChange?.(event.target.value);
@@ -111,17 +91,15 @@ export const RadioFieldWithChildren = (props) => {
             className="cf-form-radio-option"
             key={`${idPart}-${option.value}-${i}`}
           >
-            <input
-              onChange={handleChange}
+            <RadioInput
+              handleChange={handleChange}
               name={name}
-              type={ACD_LEVERS.data_types.radio}
-              id={`${idPart}_${option.value}`}
-              value={option.value}
-              // eslint-disable-next-line no-undefined
-              checked={controlled ? value === option.value : undefined}
-              disabled={optionDisabled}
-              ref={inputRef}
-              {...inputProps}
+              idPart={idPart}
+              option={option}
+              controlled={controlled}
+              value={value}
+              inputRef={inputRef}
+              inputProps={inputProps}
             />
             <label
               className={optionDisabled ? 'disabled' : ''}
@@ -134,7 +112,11 @@ export const RadioFieldWithChildren = (props) => {
           </div>
           );
 
-          return maybeAddTooltip(option, radioField);
+          return (
+            <MaybeAddTooltip key={option.value} option={option}>
+              {radioField}
+            </MaybeAddTooltip>
+          );
         })}
       </div>
     </fieldset>
diff --git a/client/app/components/RadioInput.jsx b/client/app/components/RadioInput.jsx
new file mode 100644
index 00000000000..343f5b2c2ea
--- /dev/null
+++ b/client/app/components/RadioInput.jsx
@@ -0,0 +1,37 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import ACD_LEVERS from '../../constants/ACD_LEVERS';
+
+const RadioInput = ({ handleChange, name, idPart, option, controlled, value, inputRef, inputProps }) => {
+  const isChecked = controlled ? value === option.value : option.checked;
+
+  return (
+    <input
+      onChange={handleChange}
+      name={name}
+      type={ACD_LEVERS.data_types.radio}
+      id={`${idPart}_${option.value}`}
+      value={option.value}
+      checked={isChecked}
+      disabled={Boolean(option.disabled)}
+      ref={inputRef}
+      {...inputProps}
+    />
+  );
+};
+
+RadioInput.propTypes = {
+  handleChange: PropTypes.func.isRequired,
+  name: PropTypes.string.isRequired,
+  idPart: PropTypes.string.isRequired,
+  option: PropTypes.object.isRequired,
+  controlled: PropTypes.bool.isRequired,
+  value: PropTypes.oneOfType([PropTypes.string, PropTypes.bool]).isRequired,
+  inputRef: PropTypes.oneOfType([
+    PropTypes.func,
+    PropTypes.shape({ current: PropTypes.instanceOf(Element) }),
+  ]),
+  inputProps: PropTypes.object,
+};
+
+export default RadioInput;
diff --git a/client/app/components/TooltipHelper.jsx b/client/app/components/TooltipHelper.jsx
new file mode 100644
index 00000000000..eda43cc4c78
--- /dev/null
+++ b/client/app/components/TooltipHelper.jsx
@@ -0,0 +1,34 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import Tooltip from './Tooltip';
+
+const MaybeAddTooltip = ({ option, children }) => {
+  if (!option.tooltipText) {
+    return children;
+  }
+
+  const keyId = `tooltip-${option.value}`;
+
+  return (
+    <Tooltip
+      key={keyId}
+      id={keyId}
+      text={option.tooltipText}
+      position="right"
+      className="cf-radio-option-tooltip"
+      offset={{ right: 15 }}
+    >
+      {children}
+    </Tooltip>
+  );
+};
+
+MaybeAddTooltip.propTypes = {
+  option: PropTypes.shape({
+    tooltipText: PropTypes.string,
+    value: PropTypes.string.isRequired,
+  }).isRequired,
+  children: PropTypes.node.isRequired,
+};
+
+export default MaybeAddTooltip;
diff --git a/client/app/components/fieldUtils.js b/client/app/components/fieldUtils.js
new file mode 100644
index 00000000000..b757900f3eb
--- /dev/null
+++ b/client/app/components/fieldUtils.js
@@ -0,0 +1,4 @@
+export const extractFieldProps = (props) => {
+  const { id, className, label, inputRef } = props;
+  return { id, className, label, inputRef };
+};
diff --git a/client/app/queue/correspondence/CorrespondenceTaskRows.jsx b/client/app/queue/correspondence/CorrespondenceTaskRows.jsx
index 29a7184d82a..7d4fa949d09 100644
--- a/client/app/queue/correspondence/CorrespondenceTaskRows.jsx
+++ b/client/app/queue/correspondence/CorrespondenceTaskRows.jsx
@@ -62,11 +62,11 @@ const isCancelled = (task) => {
   return task.status === TASK_STATUSES.cancelled;
 };
 
-const establishmentTask = (task) => {
+const establishmentTaskCorrespondence = (task) => {
   return task.type === 'EstablishmentTask';
 };
 
-const tdClassNames = (timeline, task) => {
+const tdClassNamesforCorrespondence = (timeline, task) => {
   const containerClass = timeline ? taskInfoWithIconTimelineContainer : '';
   const closedAtClass = task.closedAt ? null : <span className="greyDotTimelineStyling"></span>;
 
@@ -174,7 +174,7 @@ class CorrespondenceTaskRows extends React.PureComponent {
       <div className="cf-row-wrapper">
         {taskInstructionsVisible && (
           <React.Fragment key={`${task.assignedOn}${task.label}`}>
-            {!establishmentTask(task) &&
+            {!establishmentTaskCorrespondence(task) &&
             <dt style={{ width: '100%' }}>
               {COPY.TASK_SNAPSHOT_TASK_INSTRUCTIONS_LABEL}
             </dt>
@@ -251,7 +251,7 @@ class CorrespondenceTaskRows extends React.PureComponent {
         </td>
         <td
           {...taskInfoWithIconContainer}
-          className={tdClassNames(timeline, task)}
+          className={tdClassNamesforCorrespondence(timeline, task)}
         >
           {isCancelled(task) ? <CancelIcon /> : closedAtIcon(task, timeline)}
 
diff --git a/client/test/app/hearings/components/__snapshots__/Details.test.js.snap b/client/test/app/hearings/components/__snapshots__/Details.test.js.snap
index 99e6d78bccc..c9d95687dec 100644
--- a/client/test/app/hearings/components/__snapshots__/Details.test.js.snap
+++ b/client/test/app/hearings/components/__snapshots__/Details.test.js.snap
@@ -479,63 +479,138 @@ exports[`Details Displays HearingConversion when converting from central 1`] = `
                         <div
                           className="cf-form-radio-options"
                         >
-                          <div
-                            className="cf-form-radio-option"
+                          <MaybeAddTooltip
+                            option={
+                              Object {
+                                "disabled": undefined,
+                                "displayText": "8:30 AM Eastern Time (US & Canada)",
+                                "value": "08:30",
+                              }
+                            }
                           >
-                            <input
-                              checked={false}
-                              disabled={false}
-                              id="hearingTime0_08:30"
-                              name="hearingTime0"
-                              onChange={[Function]}
-                              type="radio"
-                              value="08:30"
-                            />
-                            <label
-                              className=""
-                              htmlFor="hearingTime0_08:30"
+                            <div
+                              className="cf-form-radio-option"
                             >
-                              8:30 AM Eastern Time (US & Canada)
-                            </label>
-                          </div>
-                          <div
-                            className="cf-form-radio-option"
+                              <RadioInput
+                                controlled={true}
+                                handleChange={[Function]}
+                                idPart="hearingTime0"
+                                name="hearingTime0"
+                                option={
+                                  Object {
+                                    "disabled": undefined,
+                                    "displayText": "8:30 AM Eastern Time (US & Canada)",
+                                    "value": "08:30",
+                                  }
+                                }
+                                value="other"
+                              >
+                                <input
+                                  checked={false}
+                                  disabled={false}
+                                  id="hearingTime0_08:30"
+                                  name="hearingTime0"
+                                  onChange={[Function]}
+                                  type="radio"
+                                  value="08:30"
+                                />
+                              </RadioInput>
+                              <label
+                                className=""
+                                htmlFor="hearingTime0_08:30"
+                              >
+                                8:30 AM Eastern Time (US & Canada)
+                              </label>
+                            </div>
+                          </MaybeAddTooltip>
+                          <MaybeAddTooltip
+                            option={
+                              Object {
+                                "disabled": undefined,
+                                "displayText": "12:30 PM Eastern Time (US & Canada)",
+                                "value": "12:30",
+                              }
+                            }
                           >
-                            <input
-                              checked={false}
-                              disabled={false}
-                              id="hearingTime0_12:30"
-                              name="hearingTime0"
-                              onChange={[Function]}
-                              type="radio"
-                              value="12:30"
-                            />
-                            <label
-                              className=""
-                              htmlFor="hearingTime0_12:30"
+                            <div
+                              className="cf-form-radio-option"
                             >
-                              12:30 PM Eastern Time (US & Canada)
-                            </label>
-                          </div>
-                          <div
-                            className="cf-form-radio-option"
+                              <RadioInput
+                                controlled={true}
+                                handleChange={[Function]}
+                                idPart="hearingTime0"
+                                name="hearingTime0"
+                                option={
+                                  Object {
+                                    "disabled": undefined,
+                                    "displayText": "12:30 PM Eastern Time (US & Canada)",
+                                    "value": "12:30",
+                                  }
+                                }
+                                value="other"
+                              >
+                                <input
+                                  checked={false}
+                                  disabled={false}
+                                  id="hearingTime0_12:30"
+                                  name="hearingTime0"
+                                  onChange={[Function]}
+                                  type="radio"
+                                  value="12:30"
+                                />
+                              </RadioInput>
+                              <label
+                                className=""
+                                htmlFor="hearingTime0_12:30"
+                              >
+                                12:30 PM Eastern Time (US & Canada)
+                              </label>
+                            </div>
+                          </MaybeAddTooltip>
+                          <MaybeAddTooltip
+                            option={
+                              Object {
+                                "disabled": undefined,
+                                "displayText": "Other",
+                                "value": "other",
+                              }
+                            }
                           >
-                            <input
-                              checked={true}
-                              disabled={false}
-                              id="hearingTime0_other"
-                              name="hearingTime0"
-                              onChange={[Function]}
-                              type="radio"
-                              value="other"
-                            />
-                            <label
-                              className=""
-                              htmlFor="hearingTime0_other"
+                            <div
+                              className="cf-form-radio-option"
                             >
-                              Other
-                            </label>
-                          </div>
+                              <RadioInput
+                                controlled={true}
+                                handleChange={[Function]}
+                                idPart="hearingTime0"
+                                name="hearingTime0"
+                                option={
+                                  Object {
+                                    "disabled": undefined,
+                                    "displayText": "Other",
+                                    "value": "other",
+                                  }
+                                }
+                                value="other"
+                              >
+                                <input
+                                  checked={true}
+                                  disabled={false}
+                                  id="hearingTime0_other"
+                                  name="hearingTime0"
+                                  onChange={[Function]}
+                                  type="radio"
+                                  value="other"
+                                />
+                              </RadioInput>
+                              <label
+                                className=""
+                                htmlFor="hearingTime0_other"
+                              >
+                                Other
+                              </label>
+                            </div>
+                          </MaybeAddTooltip>
                         </div>
                       </fieldset>
                     </RadioField>
@@ -42625,66 +42700,144 @@ exports[`Details Displays HearingConversion when converting from video 1`] = `
                         <div
                           className="cf-form-radio-options"
                         >
-                          <div
-                            className="cf-form-radio-option"
-                            key="hearingTime0-08:30-0"
+                          <MaybeAddTooltip
+                            key="08:30"
+                            option={
+                              Object {
+                                "disabled": undefined,
+                                "displayText": "8:30 AM Eastern Time (US & Canada)",
+                                "value": "08:30",
+                              }
+                            }
                           >
-                            <input
-                              checked={false}
-                              disabled={false}
-                              id="hearingTime0_08:30"
-                              name="hearingTime0"
-                              onChange={[Function]}
-                              type="radio"
-                              value="08:30"
-                            />
-                            <label
-                              className=""
-                              htmlFor="hearingTime0_08:30"
+                            <div
+                              className="cf-form-radio-option"
+                              key="hearingTime0-08:30-0"
                             >
-                              8:30 AM Eastern Time (US & Canada)
-                            </label>
-                          </div>
-                          <div
-                            className="cf-form-radio-option"
-                            key="hearingTime0-12:30-1"
+                              <RadioInput
+                                controlled={true}
+                                handleChange={[Function]}
+                                idPart="hearingTime0"
+                                name="hearingTime0"
+                                option={
+                                  Object {
+                                    "disabled": undefined,
+                                    "displayText": "8:30 AM Eastern Time (US & Canada)",
+                                    "value": "08:30",
+                                  }
+                                }
+                                value="other"
+                              >
+                                <input
+                                  checked={false}
+                                  disabled={false}
+                                  id="hearingTime0_08:30"
+                                  name="hearingTime0"
+                                  onChange={[Function]}
+                                  type="radio"
+                                  value="08:30"
+                                />
+                              </RadioInput>
+                              <label
+                                className=""
+                                htmlFor="hearingTime0_08:30"
+                              >
+                                8:30 AM Eastern Time (US & Canada)
+                              </label>
+                            </div>
+                          </MaybeAddTooltip>
+                          <MaybeAddTooltip
+                            key="12:30"
+                            option={
+                              Object {
+                                "disabled": undefined,
+                                "displayText": "12:30 PM Eastern Time (US & Canada)",
+                                "value": "12:30",
+                              }
+                            }
                           >
-                            <input
-                              checked={false}
-                              disabled={false}
-                              id="hearingTime0_12:30"
-                              name="hearingTime0"
-                              onChange={[Function]}
-                              type="radio"
-                              value="12:30"
-                            />
-                            <label
-                              className=""
-                              htmlFor="hearingTime0_12:30"
+                            <div
+                              className="cf-form-radio-option"
+                              key="hearingTime0-12:30-1"
                             >
-                              12:30 PM Eastern Time (US & Canada)
-                            </label>
-                          </div>
-                          <div
-                            className="cf-form-radio-option"
-                            key="hearingTime0-other-2"
+                              <RadioInput
+                                controlled={true}
+                                handleChange={[Function]}
+                                idPart="hearingTime0"
+                                name="hearingTime0"
+                                option={
+                                  Object {
+                                    "disabled": undefined,
+                                    "displayText": "12:30 PM Eastern Time (US & Canada)",
+                                    "value": "12:30",
+                                  }
+                                }
+                                value="other"
+                              >
+                                <input
+                                  checked={false}
+                                  disabled={false}
+                                  id="hearingTime0_12:30"
+                                  name="hearingTime0"
+                                  onChange={[Function]}
+                                  type="radio"
+                                  value="12:30"
+                                />
+                              </RadioInput>
+                              <label
+                                className=""
+                                htmlFor="hearingTime0_12:30"
+                              >
+                                12:30 PM Eastern Time (US & Canada)
+                              </label>
+                            </div>
+                          </MaybeAddTooltip>
+                          <MaybeAddTooltip
+                            key="other"
+                            option={
+                              Object {
+                                "disabled": undefined,
+                                "displayText": "Other",
+                                "value": "other",
+                              }
+                            }
                           >
-                            <input
-                              checked={true}
-                              disabled={false}
-                              id="hearingTime0_other"
-                              name="hearingTime0"
-                              onChange={[Function]}
-                              type="radio"
-                              value="other"
-                            />
-                            <label
-                              className=""
-                              htmlFor="hearingTime0_other"
+                            <div
+                              className="cf-form-radio-option"
+                              key="hearingTime0-other-2"
                             >
-                              Other
-                            </label>
-                          </div>
+                              <RadioInput
+                                controlled={true}
+                                handleChange={[Function]}
+                                idPart="hearingTime0"
+                                name="hearingTime0"
+                                option={
+                                  Object {
+                                    "disabled": undefined,
+                                    "displayText": "Other",
+                                    "value": "other",
+                                  }
+                                }
+                                value="other"
+                              >
+                                <input
+                                  checked={true}
+                                  disabled={false}
+                                  id="hearingTime0_other"
+                                  name="hearingTime0"
+                                  onChange={[Function]}
+                                  type="radio"
+                                  value="other"
+                                />
+                              </RadioInput>
+                              <label
+                                className=""
+                                htmlFor="hearingTime0_other"
+                              >
+                                Other
+                              </label>
+                            </div>
+                          </MaybeAddTooltip>
                         </div>
                       </fieldset>
                     </RadioField>
@@ -86121,63 +86274,138 @@ exports[`Details Displays HearingConversion when converting from virtual 1`] = `
                         <div
                           className="cf-form-radio-options"
                         >
-                          <div
-                            className="cf-form-radio-option"
+                          <MaybeAddTooltip
+                            option={
+                              Object {
+                                "disabled": undefined,
+                                "displayText": "8:30 AM Eastern Time (US & Canada)",
+                                "value": "08:30",
+                              }
+                            }
                           >
-                            <input
-                              checked={false}
-                              disabled={false}
-                              id="hearingTime0_08:30"
-                              name="hearingTime0"
-                              onChange={[Function]}
-                              type="radio"
-                              value="08:30"
-                            />
-                            <label
-                              className=""
-                              htmlFor="hearingTime0_08:30"
+                            <div
+                              className="cf-form-radio-option"
                             >
-                              8:30 AM Eastern Time (US & Canada)
-                            </label>
-                          </div>
-                          <div
-                            className="cf-form-radio-option"
+                              <RadioInput
+                                controlled={true}
+                                handleChange={[Function]}
+                                idPart="hearingTime0"
+                                name="hearingTime0"
+                                option={
+                                  Object {
+                                    "disabled": undefined,
+                                    "displayText": "8:30 AM Eastern Time (US & Canada)",
+                                    "value": "08:30",
+                                  }
+                                }
+                                value="other"
+                              >
+                                <input
+                                  checked={false}
+                                  disabled={false}
+                                  id="hearingTime0_08:30"
+                                  name="hearingTime0"
+                                  onChange={[Function]}
+                                  type="radio"
+                                  value="08:30"
+                                />
+                              </RadioInput>
+                              <label
+                                className=""
+                                htmlFor="hearingTime0_08:30"
+                              >
+                                8:30 AM Eastern Time (US & Canada)
+                              </label>
+                            </div>
+                          </MaybeAddTooltip>
+                          <MaybeAddTooltip
+                            option={
+                              Object {
+                                "disabled": undefined,
+                                "displayText": "12:30 PM Eastern Time (US & Canada)",
+                                "value": "12:30",
+                              }
+                            }
                           >
-                            <input
-                              checked={false}
-                              disabled={false}
-                              id="hearingTime0_12:30"
-                              name="hearingTime0"
-                              onChange={[Function]}
-                              type="radio"
-                              value="12:30"
-                            />
-                            <label
-                              className=""
-                              htmlFor="hearingTime0_12:30"
+                            <div
+                              className="cf-form-radio-option"
                             >
-                              12:30 PM Eastern Time (US & Canada)
-                            </label>
-                          </div>
-                          <div
-                            className="cf-form-radio-option"
+                              <RadioInput
+                                controlled={true}
+                                handleChange={[Function]}
+                                idPart="hearingTime0"
+                                name="hearingTime0"
+                                option={
+                                  Object {
+                                    "disabled": undefined,
+                                    "displayText": "12:30 PM Eastern Time (US & Canada)",
+                                    "value": "12:30",
+                                  }
+                                }
+                                value="other"
+                              >
+                                <input
+                                  checked={false}
+                                  disabled={false}
+                                  id="hearingTime0_12:30"
+                                  name="hearingTime0"
+                                  onChange={[Function]}
+                                  type="radio"
+                                  value="12:30"
+                                />
+                              </RadioInput>
+                              <label
+                                className=""
+                                htmlFor="hearingTime0_12:30"
+                              >
+                                12:30 PM Eastern Time (US & Canada)
+                              </label>
+                            </div>
+                          </MaybeAddTooltip>
+                          <MaybeAddTooltip
+                            option={
+                              Object {
+                                "disabled": undefined,
+                                "displayText": "Other",
+                                "value": "other",
+                              }
+                            }
                           >
-                            <input
-                              checked={true}
-                              disabled={false}
-                              id="hearingTime0_other"
-                              name="hearingTime0"
-                              onChange={[Function]}
-                              type="radio"
-                              value="other"
-                            />
-                            <label
-                              className=""
-                              htmlFor="hearingTime0_other"
+                            <div
+                              className="cf-form-radio-option"
                             >
-                              Other
-                            </label>
-                          </div>
+                              <RadioInput
+                                controlled={true}
+                                handleChange={[Function]}
+                                idPart="hearingTime0"
+                                name="hearingTime0"
+                                option={
+                                  Object {
+                                    "disabled": undefined,
+                                    "displayText": "Other",
+                                    "value": "other",
+                                  }
+                                }
+                                value="other"
+                              >
+                                <input
+                                  checked={true}
+                                  disabled={false}
+                                  id="hearingTime0_other"
+                                  name="hearingTime0"
+                                  onChange={[Function]}
+                                  type="radio"
+                                  value="other"
+                                />
+                              </RadioInput>
+                              <label
+                                className=""
+                                htmlFor="hearingTime0_other"
+                              >
+                                Other
+                              </label>
+                            </div>
+                          </MaybeAddTooltip>
                         </div>
                       </fieldset>
                     </RadioField>
@@ -177659,82 +177887,182 @@ exports[`Details Displays VirtualHearing details when there is a virtual hearing
                             <div
                               className="cf-form-radio-options"
                             >
-                              <div
-                                className="cf-form-radio-option"
+                              <MaybeAddTooltip
+                                option={
+                                  Object {
+                                    "disabled": true,
+                                    "displayText": "Proceed without transcript",
+                                    "value": "Proceed without transcript",
+                                  }
+                                }
                               >
-                                <input
-                                  checked={false}
-                                  disabled={true}
-                                  id="requestedRemedy_Proceed without transcript"
-                                  name="requestedRemedy"
-                                  onChange={[Function]}
-                                  type="radio"
-                                  value="Proceed without transcript"
-                                />
-                                <label
-                                  className="disabled"
-                                  htmlFor="requestedRemedy_Proceed without transcript"
+                                <div
+                                  className="cf-form-radio-option"
                                 >
-                                  Proceed without transcript
-                                </label>
-                              </div>
-                              <div
-                                className="cf-form-radio-option"
+                                  <RadioInput
+                                    controlled={true}
+                                    handleChange={[Function]}
+                                    idPart="requestedRemedy"
+                                    name="requestedRemedy"
+                                    option={
+                                      Object {
+                                        "disabled": true,
+                                        "displayText": "Proceed without transcript",
+                                        "value": "Proceed without transcript",
+                                      }
+                                    }
+                                    value=""
+                                  >
+                                    <input
+                                      checked={false}
+                                      disabled={true}
+                                      id="requestedRemedy_Proceed without transcript"
+                                      name="requestedRemedy"
+                                      onChange={[Function]}
+                                      type="radio"
+                                      value="Proceed without transcript"
+                                    />
+                                  </RadioInput>
+                                  <label
+                                    className="disabled"
+                                    htmlFor="requestedRemedy_Proceed without transcript"
+                                  >
+                                    Proceed without transcript
+                                  </label>
+                                </div>
+                              </MaybeAddTooltip>
+                              <MaybeAddTooltip
+                                option={
+                                  Object {
+                                    "disabled": true,
+                                    "displayText": "Proceed with partial transcript",
+                                    "value": "Proceed with partial transcript",
+                                  }
+                                }
                               >
-                                <input
-                                  checked={false}
-                                  disabled={true}
-                                  id="requestedRemedy_Proceed with partial transcript"
-                                  name="requestedRemedy"
-                                  onChange={[Function]}
-                                  type="radio"
-                                  value="Proceed with partial transcript"
-                                />
-                                <label
-                                  className="disabled"
-                                  htmlFor="requestedRemedy_Proceed with partial transcript"
+                                <div
+                                  className="cf-form-radio-option"
                                 >
-                                  Proceed with partial transcript
-                                </label>
-                              </div>
-                              <div
-                                className="cf-form-radio-option"
+                                  <RadioInput
+                                    controlled={true}
+                                    handleChange={[Function]}
+                                    idPart="requestedRemedy"
+                                    name="requestedRemedy"
+                                    option={
+                                      Object {
+                                        "disabled": true,
+                                        "displayText": "Proceed with partial transcript",
+                                        "value": "Proceed with partial transcript",
+                                      }
+                                    }
+                                    value=""
+                                  >
+                                    <input
+                                      checked={false}
+                                      disabled={true}
+                                      id="requestedRemedy_Proceed with partial transcript"
+                                      name="requestedRemedy"
+                                      onChange={[Function]}
+                                      type="radio"
+                                      value="Proceed with partial transcript"
+                                    />
+                                  </RadioInput>
+                                  <label
+                                    className="disabled"
+                                    htmlFor="requestedRemedy_Proceed with partial transcript"
+                                  >
+                                    Proceed with partial transcript
+                                  </label>
+                                </div>
+                              </MaybeAddTooltip>
+                              <MaybeAddTooltip
+                                option={
+                                  Object {
+                                    "disabled": true,
+                                    "displayText": "New hearing",
+                                    "value": "New hearing",
+                                  }
+                                }
                               >
-                                <input
-                                  checked={false}
-                                  disabled={true}
-                                  id="requestedRemedy_New hearing"
-                                  name="requestedRemedy"
-                                  onChange={[Function]}
-                                  type="radio"
-                                  value="New hearing"
-                                />
-                                <label
-                                  className="disabled"
-                                  htmlFor="requestedRemedy_New hearing"
+                                <div
+                                  className="cf-form-radio-option"
                                 >
-                                  New hearing
-                                </label>
-                              </div>
-                              <div
-                                className="cf-form-radio-option"
+                                  <RadioInput
+                                    controlled={true}
+                                    handleChange={[Function]}
+                                    idPart="requestedRemedy"
+                                    name="requestedRemedy"
+                                    option={
+                                      Object {
+                                        "disabled": true,
+                                        "displayText": "New hearing",
+                                        "value": "New hearing",
+                                      }
+                                    }
+                                    value=""
+                                  >
+                                    <input
+                                      checked={false}
+                                      disabled={true}
+                                      id="requestedRemedy_New hearing"
+                                      name="requestedRemedy"
+                                      onChange={[Function]}
+                                      type="radio"
+                                      value="New hearing"
+                                    />
+                                  </RadioInput>
+                                  <label
+                                    className="disabled"
+                                    htmlFor="requestedRemedy_New hearing"
+                                  >
+                                    New hearing
+                                  </label>
+                                </div>
+                              </MaybeAddTooltip>
+                              <MaybeAddTooltip
+                                option={
+                                  Object {
+                                    "disabled": true,
+                                    "displayText": "None",
+                                    "value": "",
+                                  }
+                                }
                               >
-                                <input
-                                  checked={true}
-                                  disabled={true}
-                                  id="requestedRemedy_"
-                                  name="requestedRemedy"
-                                  onChange={[Function]}
-                                  type="radio"
-                                  value=""
-                                />
-                                <label
-                                  className="disabled"
-                                  htmlFor="requestedRemedy_"
+                                <div
+                                  className="cf-form-radio-option"
                                 >
-                                  None
-                                </label>
-                              </div>
+                                  <RadioInput
+                                    controlled={true}
+                                    handleChange={[Function]}
+                                    idPart="requestedRemedy"
+                                    name="requestedRemedy"
+                                    option={
+                                      Object {
+                                        "disabled": true,
+                                        "displayText": "None",
+                                        "value": "",
+                                      }
+                                    }
+                                    value=""
+                                  >
+                                    <input
+                                      checked={true}
+                                      disabled={true}
+                                      id="requestedRemedy_"
+                                      name="requestedRemedy"
+                                      onChange={[Function]}
+                                      type="radio"
+                                      value=""
+                                    />
+                                  </RadioInput>
+                                  <label
+                                    className="disabled"
+                                    htmlFor="requestedRemedy_"
+                                  >
+                                    None
+                                  </label>
+                                </div>
+                              </MaybeAddTooltip>
                             </div>
                           </fieldset>
                         </RadioField>
@@ -226373,82 +226701,182 @@ exports[`Details Does not display EmailConfirmationModal when updating transcrip
                             <div
                               className="cf-form-radio-options"
                             >
-                              <div
-                                className="cf-form-radio-option"
+                              <MaybeAddTooltip
+                                option={
+                                  Object {
+                                    "disabled": true,
+                                    "displayText": "Proceed without transcript",
+                                    "value": "Proceed without transcript",
+                                  }
+                                }
                               >
-                                <input
-                                  checked={false}
-                                  disabled={true}
-                                  id="requestedRemedy_Proceed without transcript"
-                                  name="requestedRemedy"
-                                  onChange={[Function]}
-                                  type="radio"
-                                  value="Proceed without transcript"
-                                />
-                                <label
-                                  className="disabled"
-                                  htmlFor="requestedRemedy_Proceed without transcript"
+                                <div
+                                  className="cf-form-radio-option"
                                 >
-                                  Proceed without transcript
-                                </label>
-                              </div>
-                              <div
-                                className="cf-form-radio-option"
+                                  <RadioInput
+                                    controlled={true}
+                                    handleChange={[Function]}
+                                    idPart="requestedRemedy"
+                                    name="requestedRemedy"
+                                    option={
+                                      Object {
+                                        "disabled": true,
+                                        "displayText": "Proceed without transcript",
+                                        "value": "Proceed without transcript",
+                                      }
+                                    }
+                                    value=""
+                                  >
+                                    <input
+                                      checked={false}
+                                      disabled={true}
+                                      id="requestedRemedy_Proceed without transcript"
+                                      name="requestedRemedy"
+                                      onChange={[Function]}
+                                      type="radio"
+                                      value="Proceed without transcript"
+                                    />
+                                  </RadioInput>
+                                  <label
+                                    className="disabled"
+                                    htmlFor="requestedRemedy_Proceed without transcript"
+                                  >
+                                    Proceed without transcript
+                                  </label>
+                                </div>
+                              </MaybeAddTooltip>
+                              <MaybeAddTooltip
+                                option={
+                                  Object {
+                                    "disabled": true,
+                                    "displayText": "Proceed with partial transcript",
+                                    "value": "Proceed with partial transcript",
+                                  }
+                                }
                               >
-                                <input
-                                  checked={false}
-                                  disabled={true}
-                                  id="requestedRemedy_Proceed with partial transcript"
-                                  name="requestedRemedy"
-                                  onChange={[Function]}
-                                  type="radio"
-                                  value="Proceed with partial transcript"
-                                />
-                                <label
-                                  className="disabled"
-                                  htmlFor="requestedRemedy_Proceed with partial transcript"
+                                <div
+                                  className="cf-form-radio-option"
                                 >
-                                  Proceed with partial transcript
-                                </label>
-                              </div>
-                              <div
-                                className="cf-form-radio-option"
+                                  <RadioInput
+                                    controlled={true}
+                                    handleChange={[Function]}
+                                    idPart="requestedRemedy"
+                                    name="requestedRemedy"
+                                    option={
+                                      Object {
+                                        "disabled": true,
+                                        "displayText": "Proceed with partial transcript",
+                                        "value": "Proceed with partial transcript",
+                                      }
+                                    }
+                                    value=""
+                                  >
+                                    <input
+                                      checked={false}
+                                      disabled={true}
+                                      id="requestedRemedy_Proceed with partial transcript"
+                                      name="requestedRemedy"
+                                      onChange={[Function]}
+                                      type="radio"
+                                      value="Proceed with partial transcript"
+                                    />
+                                  </RadioInput>
+                                  <label
+                                    className="disabled"
+                                    htmlFor="requestedRemedy_Proceed with partial transcript"
+                                  >
+                                    Proceed with partial transcript
+                                  </label>
+                                </div>
+                              </MaybeAddTooltip>
+                              <MaybeAddTooltip
+                                option={
+                                  Object {
+                                    "disabled": true,
+                                    "displayText": "New hearing",
+                                    "value": "New hearing",
+                                  }
+                                }
                               >
-                                <input
-                                  checked={false}
-                                  disabled={true}
-                                  id="requestedRemedy_New hearing"
-                                  name="requestedRemedy"
-                                  onChange={[Function]}
-                                  type="radio"
-                                  value="New hearing"
-                                />
-                                <label
-                                  className="disabled"
-                                  htmlFor="requestedRemedy_New hearing"
+                                <div
+                                  className="cf-form-radio-option"
                                 >
-                                  New hearing
-                                </label>
-                              </div>
-                              <div
-                                className="cf-form-radio-option"
+                                  <RadioInput
+                                    controlled={true}
+                                    handleChange={[Function]}
+                                    idPart="requestedRemedy"
+                                    name="requestedRemedy"
+                                    option={
+                                      Object {
+                                        "disabled": true,
+                                        "displayText": "New hearing",
+                                        "value": "New hearing",
+                                      }
+                                    }
+                                    value=""
+                                  >
+                                    <input
+                                      checked={false}
+                                      disabled={true}
+                                      id="requestedRemedy_New hearing"
+                                      name="requestedRemedy"
+                                      onChange={[Function]}
+                                      type="radio"
+                                      value="New hearing"
+                                    />
+                                  </RadioInput>
+                                  <label
+                                    className="disabled"
+                                    htmlFor="requestedRemedy_New hearing"
+                                  >
+                                    New hearing
+                                  </label>
+                                </div>
+                              </MaybeAddTooltip>
+                              <MaybeAddTooltip
+                                option={
+                                  Object {
+                                    "disabled": true,
+                                    "displayText": "None",
+                                    "value": "",
+                                  }
+                                }
                               >
-                                <input
-                                  checked={true}
-                                  disabled={true}
-                                  id="requestedRemedy_"
-                                  name="requestedRemedy"
-                                  onChange={[Function]}
-                                  type="radio"
-                                  value=""
-                                />
-                                <label
-                                  className="disabled"
-                                  htmlFor="requestedRemedy_"
+                                <div
+                                  className="cf-form-radio-option"
                                 >
-                                  None
-                                </label>
-                              </div>
+                                  <RadioInput
+                                    controlled={true}
+                                    handleChange={[Function]}
+                                    idPart="requestedRemedy"
+                                    name="requestedRemedy"
+                                    option={
+                                      Object {
+                                        "disabled": true,
+                                        "displayText": "None",
+                                        "value": "",
+                                      }
+                                    }
+                                    value=""
+                                  >
+                                    <input
+                                      checked={true}
+                                      disabled={true}
+                                      id="requestedRemedy_"
+                                      name="requestedRemedy"
+                                      onChange={[Function]}
+                                      type="radio"
+                                      value=""
+                                    />
+                                  </RadioInput>
+                                  <label
+                                    className="disabled"
+                                    htmlFor="requestedRemedy_"
+                                  >
+                                    None
+                                  </label>
+                                </div>
+                              </MaybeAddTooltip>
                             </div>
                           </fieldset>
                         </RadioField>
@@ -315955,86 +316383,190 @@ exports[`Details Matches snapshot with default props 1`] = `
                             <div
                               className="cf-form-radio-options"
                             >
-                              <div
-                                className="cf-form-radio-option"
-                                key="requestedRemedy-Proceed without transcript-0"
+                              <MaybeAddTooltip
+                                key="Proceed without transcript"
+                                option={
+                                  Object {
+                                    "disabled": true,
+                                    "displayText": "Proceed without transcript",
+                                    "value": "Proceed without transcript",
+                                  }
+                                }
                               >
-                                <input
-                                  checked={false}
-                                  disabled={true}
-                                  id="requestedRemedy_Proceed without transcript"
-                                  name="requestedRemedy"
-                                  onChange={[Function]}
-                                  type="radio"
-                                  value="Proceed without transcript"
-                                />
-                                <label
-                                  className="disabled"
-                                  htmlFor="requestedRemedy_Proceed without transcript"
+                                <div
+                                  className="cf-form-radio-option"
+                                  key="requestedRemedy-Proceed without transcript-0"
                                 >
-                                  Proceed without transcript
-                                </label>
-                              </div>
-                              <div
-                                className="cf-form-radio-option"
-                                key="requestedRemedy-Proceed with partial transcript-1"
+                                  <RadioInput
+                                    controlled={true}
+                                    handleChange={[Function]}
+                                    idPart="requestedRemedy"
+                                    name="requestedRemedy"
+                                    option={
+                                      Object {
+                                        "disabled": true,
+                                        "displayText": "Proceed without transcript",
+                                        "value": "Proceed without transcript",
+                                      }
+                                    }
+                                    value=""
+                                  >
+                                    <input
+                                      checked={false}
+                                      disabled={true}
+                                      id="requestedRemedy_Proceed without transcript"
+                                      name="requestedRemedy"
+                                      onChange={[Function]}
+                                      type="radio"
+                                      value="Proceed without transcript"
+                                    />
+                                  </RadioInput>
+                                  <label
+                                    className="disabled"
+                                    htmlFor="requestedRemedy_Proceed without transcript"
+                                  >
+                                    Proceed without transcript
+                                  </label>
+                                </div>
+                              </MaybeAddTooltip>
+                              <MaybeAddTooltip
+                                key="Proceed with partial transcript"
+                                option={
+                                  Object {
+                                    "disabled": true,
+                                    "displayText": "Proceed with partial transcript",
+                                    "value": "Proceed with partial transcript",
+                                  }
+                                }
                               >
-                                <input
-                                  checked={false}
-                                  disabled={true}
-                                  id="requestedRemedy_Proceed with partial transcript"
-                                  name="requestedRemedy"
-                                  onChange={[Function]}
-                                  type="radio"
-                                  value="Proceed with partial transcript"
-                                />
-                                <label
-                                  className="disabled"
-                                  htmlFor="requestedRemedy_Proceed with partial transcript"
+                                <div
+                                  className="cf-form-radio-option"
+                                  key="requestedRemedy-Proceed with partial transcript-1"
                                 >
-                                  Proceed with partial transcript
-                                </label>
-                              </div>
-                              <div
-                                className="cf-form-radio-option"
-                                key="requestedRemedy-New hearing-2"
+                                  <RadioInput
+                                    controlled={true}
+                                    handleChange={[Function]}
+                                    idPart="requestedRemedy"
+                                    name="requestedRemedy"
+                                    option={
+                                      Object {
+                                        "disabled": true,
+                                        "displayText": "Proceed with partial transcript",
+                                        "value": "Proceed with partial transcript",
+                                      }
+                                    }
+                                    value=""
+                                  >
+                                    <input
+                                      checked={false}
+                                      disabled={true}
+                                      id="requestedRemedy_Proceed with partial transcript"
+                                      name="requestedRemedy"
+                                      onChange={[Function]}
+                                      type="radio"
+                                      value="Proceed with partial transcript"
+                                    />
+                                  </RadioInput>
+                                  <label
+                                    className="disabled"
+                                    htmlFor="requestedRemedy_Proceed with partial transcript"
+                                  >
+                                    Proceed with partial transcript
+                                  </label>
+                                </div>
+                              </MaybeAddTooltip>
+                              <MaybeAddTooltip
+                                key="New hearing"
+                                option={
+                                  Object {
+                                    "disabled": true,
+                                    "displayText": "New hearing",
+                                    "value": "New hearing",
+                                  }
+                                }
                               >
-                                <input
-                                  checked={false}
-                                  disabled={true}
-                                  id="requestedRemedy_New hearing"
-                                  name="requestedRemedy"
-                                  onChange={[Function]}
-                                  type="radio"
-                                  value="New hearing"
-                                />
-                                <label
-                                  className="disabled"
-                                  htmlFor="requestedRemedy_New hearing"
+                                <div
+                                  className="cf-form-radio-option"
+                                  key="requestedRemedy-New hearing-2"
                                 >
-                                  New hearing
-                                </label>
-                              </div>
-                              <div
-                                className="cf-form-radio-option"
-                                key="requestedRemedy--3"
+                                  <RadioInput
+                                    controlled={true}
+                                    handleChange={[Function]}
+                                    idPart="requestedRemedy"
+                                    name="requestedRemedy"
+                                    option={
+                                      Object {
+                                        "disabled": true,
+                                        "displayText": "New hearing",
+                                        "value": "New hearing",
+                                      }
+                                    }
+                                    value=""
+                                  >
+                                    <input
+                                      checked={false}
+                                      disabled={true}
+                                      id="requestedRemedy_New hearing"
+                                      name="requestedRemedy"
+                                      onChange={[Function]}
+                                      type="radio"
+                                      value="New hearing"
+                                    />
+                                  </RadioInput>
+                                  <label
+                                    className="disabled"
+                                    htmlFor="requestedRemedy_New hearing"
+                                  >
+                                    New hearing
+                                  </label>
+                                </div>
+                              </MaybeAddTooltip>
+                              <MaybeAddTooltip
+                                key=""
+                                option={
+                                  Object {
+                                    "disabled": true,
+                                    "displayText": "None",
+                                    "value": "",
+                                  }
+                                }
                               >
-                                <input
-                                  checked={true}
-                                  disabled={true}
-                                  id="requestedRemedy_"
-                                  name="requestedRemedy"
-                                  onChange={[Function]}
-                                  type="radio"
-                                  value=""
-                                />
-                                <label
-                                  className="disabled"
-                                  htmlFor="requestedRemedy_"
+                                <div
+                                  className="cf-form-radio-option"
+                                  key="requestedRemedy--3"
                                 >
-                                  None
-                                </label>
-                              </div>
+                                  <RadioInput
+                                    controlled={true}
+                                    handleChange={[Function]}
+                                    idPart="requestedRemedy"
+                                    name="requestedRemedy"
+                                    option={
+                                      Object {
+                                        "disabled": true,
+                                        "displayText": "None",
+                                        "value": "",
+                                      }
+                                    }
+                                    value=""
+                                  >
+                                    <input
+                                      checked={true}
+                                      disabled={true}
+                                      id="requestedRemedy_"
+                                      name="requestedRemedy"
+                                      onChange={[Function]}
+                                      type="radio"
+                                      value=""
+                                    />
+                                  </RadioInput>
+                                  <label
+                                    className="disabled"
+                                    htmlFor="requestedRemedy_"
+                                  >
+                                    None
+                                  </label>
+                                </div>
+                              </MaybeAddTooltip>
                             </div>
                           </fieldset>
                         </RadioField>
diff --git a/client/test/app/hearings/components/__snapshots__/HearingConversion.test.js.snap b/client/test/app/hearings/components/__snapshots__/HearingConversion.test.js.snap
index 018c843fd40..4d32887c439 100644
--- a/client/test/app/hearings/components/__snapshots__/HearingConversion.test.js.snap
+++ b/client/test/app/hearings/components/__snapshots__/HearingConversion.test.js.snap
@@ -353,66 +353,144 @@ exports[`HearingConversion Displays email fields when hearing type is switched f
                     <div
                       className="cf-form-radio-options"
                     >
-                      <div
-                        className="cf-form-radio-option"
-                        key="hearingTime0-08:30-0"
+                      <MaybeAddTooltip
+                        key="08:30"
+                        option={
+                          Object {
+                            "disabled": undefined,
+                            "displayText": "8:30 AM Eastern Time (US & Canada)",
+                            "value": "08:30",
+                          }
+                        }
                       >
-                        <input
-                          checked={false}
-                          disabled={false}
-                          id="hearingTime0_08:30"
-                          name="hearingTime0"
-                          onChange={[Function]}
-                          type="radio"
-                          value="08:30"
-                        />
-                        <label
-                          className=""
-                          htmlFor="hearingTime0_08:30"
+                        <div
+                          className="cf-form-radio-option"
+                          key="hearingTime0-08:30-0"
                         >
-                          8:30 AM Eastern Time (US & Canada)
-                        </label>
-                      </div>
-                      <div
-                        className="cf-form-radio-option"
-                        key="hearingTime0-12:30-1"
+                          <RadioInput
+                            controlled={true}
+                            handleChange={[Function]}
+                            idPart="hearingTime0"
+                            name="hearingTime0"
+                            option={
+                              Object {
+                                "disabled": undefined,
+                                "displayText": "8:30 AM Eastern Time (US & Canada)",
+                                "value": "08:30",
+                              }
+                            }
+                            value="other"
+                          >
+                            <input
+                              checked={false}
+                              disabled={false}
+                              id="hearingTime0_08:30"
+                              name="hearingTime0"
+                              onChange={[Function]}
+                              type="radio"
+                              value="08:30"
+                            />
+                          </RadioInput>
+                          <label
+                            className=""
+                            htmlFor="hearingTime0_08:30"
+                          >
+                            8:30 AM Eastern Time (US & Canada)
+                          </label>
+                        </div>
+                      </MaybeAddTooltip>
+                      <MaybeAddTooltip
+                        key="12:30"
+                        option={
+                          Object {
+                            "disabled": undefined,
+                            "displayText": "12:30 PM Eastern Time (US & Canada)",
+                            "value": "12:30",
+                          }
+                        }
                       >
-                        <input
-                          checked={false}
-                          disabled={false}
-                          id="hearingTime0_12:30"
-                          name="hearingTime0"
-                          onChange={[Function]}
-                          type="radio"
-                          value="12:30"
-                        />
-                        <label
-                          className=""
-                          htmlFor="hearingTime0_12:30"
+                        <div
+                          className="cf-form-radio-option"
+                          key="hearingTime0-12:30-1"
                         >
-                          12:30 PM Eastern Time (US & Canada)
-                        </label>
-                      </div>
-                      <div
-                        className="cf-form-radio-option"
-                        key="hearingTime0-other-2"
+                          <RadioInput
+                            controlled={true}
+                            handleChange={[Function]}
+                            idPart="hearingTime0"
+                            name="hearingTime0"
+                            option={
+                              Object {
+                                "disabled": undefined,
+                                "displayText": "12:30 PM Eastern Time (US & Canada)",
+                                "value": "12:30",
+                              }
+                            }
+                            value="other"
+                          >
+                            <input
+                              checked={false}
+                              disabled={false}
+                              id="hearingTime0_12:30"
+                              name="hearingTime0"
+                              onChange={[Function]}
+                              type="radio"
+                              value="12:30"
+                            />
+                          </RadioInput>
+                          <label
+                            className=""
+                            htmlFor="hearingTime0_12:30"
+                          >
+                            12:30 PM Eastern Time (US & Canada)
+                          </label>
+                        </div>
+                      </MaybeAddTooltip>
+                      <MaybeAddTooltip
+                        key="other"
+                        option={
+                          Object {
+                            "disabled": undefined,
+                            "displayText": "Other",
+                            "value": "other",
+                          }
+                        }
                       >
-                        <input
-                          checked={true}
-                          disabled={false}
-                          id="hearingTime0_other"
-                          name="hearingTime0"
-                          onChange={[Function]}
-                          type="radio"
-                          value="other"
-                        />
-                        <label
-                          className=""
-                          htmlFor="hearingTime0_other"
+                        <div
+                          className="cf-form-radio-option"
+                          key="hearingTime0-other-2"
                         >
-                          Other
-                        </label>
-                      </div>
+                          <RadioInput
+                            controlled={true}
+                            handleChange={[Function]}
+                            idPart="hearingTime0"
+                            name="hearingTime0"
+                            option={
+                              Object {
+                                "disabled": undefined,
+                                "displayText": "Other",
+                                "value": "other",
+                              }
+                            }
+                            value="other"
+                          >
+                            <input
+                              checked={true}
+                              disabled={false}
+                              id="hearingTime0_other"
+                              name="hearingTime0"
+                              onChange={[Function]}
+                              type="radio"
+                              value="other"
+                            />
+                          </RadioInput>
+                          <label
+                            className=""
+                            htmlFor="hearingTime0_other"
+                          >
+                            Other
+                          </label>
+                        </div>
+                      </MaybeAddTooltip>
                     </div>
                   </fieldset>
                 </RadioField>
diff --git a/client/test/app/hearings/components/__snapshots__/ScheduleVeteran.test.js.snap b/client/test/app/hearings/components/__snapshots__/ScheduleVeteran.test.js.snap
index beb2d859dc7..06c2e23fa62 100644
--- a/client/test/app/hearings/components/__snapshots__/ScheduleVeteran.test.js.snap
+++ b/client/test/app/hearings/components/__snapshots__/ScheduleVeteran.test.js.snap
@@ -26201,66 +26201,144 @@ SAN FRANCISCO, CA 94103
                               <div
                                 className="cf-form-radio-options"
                               >
-                                <div
-                                  className="cf-form-radio-option"
-                                  key="hearingTime0-08:30-0"
+                                <MaybeAddTooltip
+                                  key="08:30"
+                                  option={
+                                    Object {
+                                      "disabled": undefined,
+                                      "displayText": "8:30 AM Eastern Time (US & Canada)",
+                                      "value": "08:30",
+                                    }
+                                  }
                                 >
-                                  <input
-                                    checked={false}
-                                    disabled={false}
-                                    id="hearingTime0_08:30"
-                                    name="hearingTime0"
-                                    onChange={[Function]}
-                                    type="radio"
-                                    value="08:30"
-                                  />
-                                  <label
-                                    className=""
-                                    htmlFor="hearingTime0_08:30"
+                                  <div
+                                    className="cf-form-radio-option"
+                                    key="hearingTime0-08:30-0"
                                   >
-                                    8:30 AM Eastern Time (US & Canada)
-                                  </label>
-                                </div>
-                                <div
-                                  className="cf-form-radio-option"
-                                  key="hearingTime0-12:30-1"
+                                    <RadioInput
+                                      controlled={true}
+                                      handleChange={[Function]}
+                                      idPart="hearingTime0"
+                                      name="hearingTime0"
+                                      option={
+                                        Object {
+                                          "disabled": undefined,
+                                          "displayText": "8:30 AM Eastern Time (US & Canada)",
+                                          "value": "08:30",
+                                        }
+                                      }
+                                      value="other"
+                                    >
+                                      <input
+                                        checked={false}
+                                        disabled={false}
+                                        id="hearingTime0_08:30"
+                                        name="hearingTime0"
+                                        onChange={[Function]}
+                                        type="radio"
+                                        value="08:30"
+                                      />
+                                    </RadioInput>
+                                    <label
+                                      className=""
+                                      htmlFor="hearingTime0_08:30"
+                                    >
+                                      8:30 AM Eastern Time (US & Canada)
+                                    </label>
+                                  </div>
+                                </MaybeAddTooltip>
+                                <MaybeAddTooltip
+                                  key="12:30"
+                                  option={
+                                    Object {
+                                      "disabled": undefined,
+                                      "displayText": "12:30 PM Eastern Time (US & Canada)",
+                                      "value": "12:30",
+                                    }
+                                  }
                                 >
-                                  <input
-                                    checked={false}
-                                    disabled={false}
-                                    id="hearingTime0_12:30"
-                                    name="hearingTime0"
-                                    onChange={[Function]}
-                                    type="radio"
-                                    value="12:30"
-                                  />
-                                  <label
-                                    className=""
-                                    htmlFor="hearingTime0_12:30"
+                                  <div
+                                    className="cf-form-radio-option"
+                                    key="hearingTime0-12:30-1"
                                   >
-                                    12:30 PM Eastern Time (US & Canada)
-                                  </label>
-                                </div>
-                                <div
-                                  className="cf-form-radio-option"
-                                  key="hearingTime0-other-2"
+                                    <RadioInput
+                                      controlled={true}
+                                      handleChange={[Function]}
+                                      idPart="hearingTime0"
+                                      name="hearingTime0"
+                                      option={
+                                        Object {
+                                          "disabled": undefined,
+                                          "displayText": "12:30 PM Eastern Time (US & Canada)",
+                                          "value": "12:30",
+                                        }
+                                      }
+                                      value="other"
+                                    >
+                                      <input
+                                        checked={false}
+                                        disabled={false}
+                                        id="hearingTime0_12:30"
+                                        name="hearingTime0"
+                                        onChange={[Function]}
+                                        type="radio"
+                                        value="12:30"
+                                      />
+                                    </RadioInput>
+                                    <label
+                                      className=""
+                                      htmlFor="hearingTime0_12:30"
+                                    >
+                                      12:30 PM Eastern Time (US & Canada)
+                                    </label>
+                                  </div>
+                                </MaybeAddTooltip>
+                                <MaybeAddTooltip
+                                  key="other"
+                                  option={
+                                    Object {
+                                      "disabled": undefined,
+                                      "displayText": "Other",
+                                      "value": "other",
+                                    }
+                                  }
                                 >
-                                  <input
-                                    checked={true}
-                                    disabled={false}
-                                    id="hearingTime0_other"
-                                    name="hearingTime0"
-                                    onChange={[Function]}
-                                    type="radio"
-                                    value="other"
-                                  />
-                                  <label
-                                    className=""
-                                    htmlFor="hearingTime0_other"
+                                  <div
+                                    className="cf-form-radio-option"
+                                    key="hearingTime0-other-2"
                                   >
-                                    Other
-                                  </label>
-                                </div>
+                                    <RadioInput
+                                      controlled={true}
+                                      handleChange={[Function]}
+                                      idPart="hearingTime0"
+                                      name="hearingTime0"
+                                      option={
+                                        Object {
+                                          "disabled": undefined,
+                                          "displayText": "Other",
+                                          "value": "other",
+                                        }
+                                      }
+                                      value="other"
+                                    >
+                                      <input
+                                        checked={true}
+                                        disabled={false}
+                                        id="hearingTime0_other"
+                                        name="hearingTime0"
+                                        onChange={[Function]}
+                                        type="radio"
+                                        value="other"
+                                      />
+                                    </RadioInput>
+                                    <label
+                                      className=""
+                                      htmlFor="hearingTime0_other"
+                                    >
+                                      Other
+                                    </label>
+                                  </div>
+                                </MaybeAddTooltip>
                               </div>
                             </fieldset>
                           </RadioField>
@@ -118894,66 +118972,144 @@ SAN FRANCISCO, CA 94103
                               <div
                                 className="cf-form-radio-options"
                               >
-                                <div
-                                  className="cf-form-radio-option"
-                                  key="hearingTime0-08:30-0"
+                                <MaybeAddTooltip
+                                  key="08:30"
+                                  option={
+                                    Object {
+                                      "disabled": undefined,
+                                      "displayText": "8:30 AM Eastern Time (US & Canada)",
+                                      "value": "08:30",
+                                    }
+                                  }
                                 >
-                                  <input
-                                    checked={false}
-                                    disabled={false}
-                                    id="hearingTime0_08:30"
-                                    name="hearingTime0"
-                                    onChange={[Function]}
-                                    type="radio"
-                                    value="08:30"
-                                  />
-                                  <label
-                                    className=""
-                                    htmlFor="hearingTime0_08:30"
+                                  <div
+                                    className="cf-form-radio-option"
+                                    key="hearingTime0-08:30-0"
                                   >
-                                    8:30 AM Eastern Time (US & Canada)
-                                  </label>
-                                </div>
-                                <div
-                                  className="cf-form-radio-option"
-                                  key="hearingTime0-12:30-1"
+                                    <RadioInput
+                                      controlled={true}
+                                      handleChange={[Function]}
+                                      idPart="hearingTime0"
+                                      name="hearingTime0"
+                                      option={
+                                        Object {
+                                          "disabled": undefined,
+                                          "displayText": "8:30 AM Eastern Time (US & Canada)",
+                                          "value": "08:30",
+                                        }
+                                      }
+                                      value="other"
+                                    >
+                                      <input
+                                        checked={false}
+                                        disabled={false}
+                                        id="hearingTime0_08:30"
+                                        name="hearingTime0"
+                                        onChange={[Function]}
+                                        type="radio"
+                                        value="08:30"
+                                      />
+                                    </RadioInput>
+                                    <label
+                                      className=""
+                                      htmlFor="hearingTime0_08:30"
+                                    >
+                                      8:30 AM Eastern Time (US & Canada)
+                                    </label>
+                                  </div>
+                                </MaybeAddTooltip>
+                                <MaybeAddTooltip
+                                  key="12:30"
+                                  option={
+                                    Object {
+                                      "disabled": undefined,
+                                      "displayText": "12:30 PM Eastern Time (US & Canada)",
+                                      "value": "12:30",
+                                    }
+                                  }
                                 >
-                                  <input
-                                    checked={false}
-                                    disabled={false}
-                                    id="hearingTime0_12:30"
-                                    name="hearingTime0"
-                                    onChange={[Function]}
-                                    type="radio"
-                                    value="12:30"
-                                  />
-                                  <label
-                                    className=""
-                                    htmlFor="hearingTime0_12:30"
+                                  <div
+                                    className="cf-form-radio-option"
+                                    key="hearingTime0-12:30-1"
                                   >
-                                    12:30 PM Eastern Time (US & Canada)
-                                  </label>
-                                </div>
-                                <div
-                                  className="cf-form-radio-option"
-                                  key="hearingTime0-other-2"
+                                    <RadioInput
+                                      controlled={true}
+                                      handleChange={[Function]}
+                                      idPart="hearingTime0"
+                                      name="hearingTime0"
+                                      option={
+                                        Object {
+                                          "disabled": undefined,
+                                          "displayText": "12:30 PM Eastern Time (US & Canada)",
+                                          "value": "12:30",
+                                        }
+                                      }
+                                      value="other"
+                                    >
+                                      <input
+                                        checked={false}
+                                        disabled={false}
+                                        id="hearingTime0_12:30"
+                                        name="hearingTime0"
+                                        onChange={[Function]}
+                                        type="radio"
+                                        value="12:30"
+                                      />
+                                    </RadioInput>
+                                    <label
+                                      className=""
+                                      htmlFor="hearingTime0_12:30"
+                                    >
+                                      12:30 PM Eastern Time (US & Canada)
+                                    </label>
+                                  </div>
+                                </MaybeAddTooltip>
+                                <MaybeAddTooltip
+                                  key="other"
+                                  option={
+                                    Object {
+                                      "disabled": undefined,
+                                      "displayText": "Other",
+                                      "value": "other",
+                                    }
+                                  }
                                 >
-                                  <input
-                                    checked={true}
-                                    disabled={false}
-                                    id="hearingTime0_other"
-                                    name="hearingTime0"
-                                    onChange={[Function]}
-                                    type="radio"
-                                    value="other"
-                                  />
-                                  <label
-                                    className=""
-                                    htmlFor="hearingTime0_other"
+                                  <div
+                                    className="cf-form-radio-option"
+                                    key="hearingTime0-other-2"
                                   >
-                                    Other
-                                  </label>
-                                </div>
+                                    <RadioInput
+                                      controlled={true}
+                                      handleChange={[Function]}
+                                      idPart="hearingTime0"
+                                      name="hearingTime0"
+                                      option={
+                                        Object {
+                                          "disabled": undefined,
+                                          "displayText": "Other",
+                                          "value": "other",
+                                        }
+                                      }
+                                      value="other"
+                                    >
+                                      <input
+                                        checked={true}
+                                        disabled={false}
+                                        id="hearingTime0_other"
+                                        name="hearingTime0"
+                                        onChange={[Function]}
+                                        type="radio"
+                                        value="other"
+                                      />
+                                    </RadioInput>
+                                    <label
+                                      className=""
+                                      htmlFor="hearingTime0_other"
+                                    >
+                                      Other
+                                    </label>
+                                  </div>
+                                </MaybeAddTooltip>
                               </div>
                             </fieldset>
                           </RadioField>
@@ -156194,66 +156350,144 @@ SAN FRANCISCO, CA 94103
                               <div
                                 className="cf-form-radio-options"
                               >
-                                <div
-                                  className="cf-form-radio-option"
-                                  key="hearingTime0-08:30-0"
+                                <MaybeAddTooltip
+                                  key="08:30"
+                                  option={
+                                    Object {
+                                      "disabled": undefined,
+                                      "displayText": "8:30 AM Eastern Time (US & Canada)",
+                                      "value": "08:30",
+                                    }
+                                  }
                                 >
-                                  <input
-                                    checked={false}
-                                    disabled={false}
-                                    id="hearingTime0_08:30"
-                                    name="hearingTime0"
-                                    onChange={[Function]}
-                                    type="radio"
-                                    value="08:30"
-                                  />
-                                  <label
-                                    className=""
-                                    htmlFor="hearingTime0_08:30"
+                                  <div
+                                    className="cf-form-radio-option"
+                                    key="hearingTime0-08:30-0"
                                   >
-                                    8:30 AM Eastern Time (US & Canada)
-                                  </label>
-                                </div>
-                                <div
-                                  className="cf-form-radio-option"
-                                  key="hearingTime0-12:30-1"
+                                    <RadioInput
+                                      controlled={true}
+                                      handleChange={[Function]}
+                                      idPart="hearingTime0"
+                                      name="hearingTime0"
+                                      option={
+                                        Object {
+                                          "disabled": undefined,
+                                          "displayText": "8:30 AM Eastern Time (US & Canada)",
+                                          "value": "08:30",
+                                        }
+                                      }
+                                      value="other"
+                                    >
+                                      <input
+                                        checked={false}
+                                        disabled={false}
+                                        id="hearingTime0_08:30"
+                                        name="hearingTime0"
+                                        onChange={[Function]}
+                                        type="radio"
+                                        value="08:30"
+                                      />
+                                    </RadioInput>
+                                    <label
+                                      className=""
+                                      htmlFor="hearingTime0_08:30"
+                                    >
+                                      8:30 AM Eastern Time (US & Canada)
+                                    </label>
+                                  </div>
+                                </MaybeAddTooltip>
+                                <MaybeAddTooltip
+                                  key="12:30"
+                                  option={
+                                    Object {
+                                      "disabled": undefined,
+                                      "displayText": "12:30 PM Eastern Time (US & Canada)",
+                                      "value": "12:30",
+                                    }
+                                  }
                                 >
-                                  <input
-                                    checked={false}
-                                    disabled={false}
-                                    id="hearingTime0_12:30"
-                                    name="hearingTime0"
-                                    onChange={[Function]}
-                                    type="radio"
-                                    value="12:30"
-                                  />
-                                  <label
-                                    className=""
-                                    htmlFor="hearingTime0_12:30"
+                                  <div
+                                    className="cf-form-radio-option"
+                                    key="hearingTime0-12:30-1"
                                   >
-                                    12:30 PM Eastern Time (US & Canada)
-                                  </label>
-                                </div>
-                                <div
-                                  className="cf-form-radio-option"
-                                  key="hearingTime0-other-2"
+                                    <RadioInput
+                                      controlled={true}
+                                      handleChange={[Function]}
+                                      idPart="hearingTime0"
+                                      name="hearingTime0"
+                                      option={
+                                        Object {
+                                          "disabled": undefined,
+                                          "displayText": "12:30 PM Eastern Time (US & Canada)",
+                                          "value": "12:30",
+                                        }
+                                      }
+                                      value="other"
+                                    >
+                                      <input
+                                        checked={false}
+                                        disabled={false}
+                                        id="hearingTime0_12:30"
+                                        name="hearingTime0"
+                                        onChange={[Function]}
+                                        type="radio"
+                                        value="12:30"
+                                      />
+                                    </RadioInput>
+                                    <label
+                                      className=""
+                                      htmlFor="hearingTime0_12:30"
+                                    >
+                                      12:30 PM Eastern Time (US & Canada)
+                                    </label>
+                                  </div>
+                                </MaybeAddTooltip>
+                                <MaybeAddTooltip
+                                  key="other"
+                                  option={
+                                    Object {
+                                      "disabled": undefined,
+                                      "displayText": "Other",
+                                      "value": "other",
+                                    }
+                                  }
                                 >
-                                  <input
-                                    checked={true}
-                                    disabled={false}
-                                    id="hearingTime0_other"
-                                    name="hearingTime0"
-                                    onChange={[Function]}
-                                    type="radio"
-                                    value="other"
-                                  />
-                                  <label
-                                    className=""
-                                    htmlFor="hearingTime0_other"
+                                  <div
+                                    className="cf-form-radio-option"
+                                    key="hearingTime0-other-2"
                                   >
-                                    Other
-                                  </label>
-                                </div>
+                                    <RadioInput
+                                      controlled={true}
+                                      handleChange={[Function]}
+                                      idPart="hearingTime0"
+                                      name="hearingTime0"
+                                      option={
+                                        Object {
+                                          "disabled": undefined,
+                                          "displayText": "Other",
+                                          "value": "other",
+                                        }
+                                      }
+                                      value="other"
+                                    >
+                                      <input
+                                        checked={true}
+                                        disabled={false}
+                                        id="hearingTime0_other"
+                                        name="hearingTime0"
+                                        onChange={[Function]}
+                                        type="radio"
+                                        value="other"
+                                      />
+                                    </RadioInput>
+                                    <label
+                                      className=""
+                                      htmlFor="hearingTime0_other"
+                                    >
+                                      Other
+                                    </label>
+                                  </div>
+                                </MaybeAddTooltip>
                               </div>
                             </fieldset>
                           </RadioField>
@@ -194615,66 +194849,144 @@ SAN FRANCISCO, CA 94103
                               <div
                                 className="cf-form-radio-options"
                               >
-                                <div
-                                  className="cf-form-radio-option"
-                                  key="hearingTime0-08:30-0"
+                                <MaybeAddTooltip
+                                  key="08:30"
+                                  option={
+                                    Object {
+                                      "disabled": undefined,
+                                      "displayText": "8:30 AM Eastern Time (US & Canada)",
+                                      "value": "08:30",
+                                    }
+                                  }
                                 >
-                                  <input
-                                    checked={false}
-                                    disabled={false}
-                                    id="hearingTime0_08:30"
-                                    name="hearingTime0"
-                                    onChange={[Function]}
-                                    type="radio"
-                                    value="08:30"
-                                  />
-                                  <label
-                                    className=""
-                                    htmlFor="hearingTime0_08:30"
+                                  <div
+                                    className="cf-form-radio-option"
+                                    key="hearingTime0-08:30-0"
                                   >
-                                    8:30 AM Eastern Time (US & Canada)
-                                  </label>
-                                </div>
-                                <div
-                                  className="cf-form-radio-option"
-                                  key="hearingTime0-12:30-1"
+                                    <RadioInput
+                                      controlled={true}
+                                      handleChange={[Function]}
+                                      idPart="hearingTime0"
+                                      name="hearingTime0"
+                                      option={
+                                        Object {
+                                          "disabled": undefined,
+                                          "displayText": "8:30 AM Eastern Time (US & Canada)",
+                                          "value": "08:30",
+                                        }
+                                      }
+                                      value="other"
+                                    >
+                                      <input
+                                        checked={false}
+                                        disabled={false}
+                                        id="hearingTime0_08:30"
+                                        name="hearingTime0"
+                                        onChange={[Function]}
+                                        type="radio"
+                                        value="08:30"
+                                      />
+                                    </RadioInput>
+                                    <label
+                                      className=""
+                                      htmlFor="hearingTime0_08:30"
+                                    >
+                                      8:30 AM Eastern Time (US & Canada)
+                                    </label>
+                                  </div>
+                                </MaybeAddTooltip>
+                                <MaybeAddTooltip
+                                  key="12:30"
+                                  option={
+                                    Object {
+                                      "disabled": undefined,
+                                      "displayText": "12:30 PM Eastern Time (US & Canada)",
+                                      "value": "12:30",
+                                    }
+                                  }
                                 >
-                                  <input
-                                    checked={false}
-                                    disabled={false}
-                                    id="hearingTime0_12:30"
-                                    name="hearingTime0"
-                                    onChange={[Function]}
-                                    type="radio"
-                                    value="12:30"
-                                  />
-                                  <label
-                                    className=""
-                                    htmlFor="hearingTime0_12:30"
+                                  <div
+                                    className="cf-form-radio-option"
+                                    key="hearingTime0-12:30-1"
                                   >
-                                    12:30 PM Eastern Time (US & Canada)
-                                  </label>
-                                </div>
-                                <div
-                                  className="cf-form-radio-option"
-                                  key="hearingTime0-other-2"
+                                    <RadioInput
+                                      controlled={true}
+                                      handleChange={[Function]}
+                                      idPart="hearingTime0"
+                                      name="hearingTime0"
+                                      option={
+                                        Object {
+                                          "disabled": undefined,
+                                          "displayText": "12:30 PM Eastern Time (US & Canada)",
+                                          "value": "12:30",
+                                        }
+                                      }
+                                      value="other"
+                                    >
+                                      <input
+                                        checked={false}
+                                        disabled={false}
+                                        id="hearingTime0_12:30"
+                                        name="hearingTime0"
+                                        onChange={[Function]}
+                                        type="radio"
+                                        value="12:30"
+                                      />
+                                    </RadioInput>
+                                    <label
+                                      className=""
+                                      htmlFor="hearingTime0_12:30"
+                                    >
+                                      12:30 PM Eastern Time (US & Canada)
+                                    </label>
+                                  </div>
+                                </MaybeAddTooltip>
+                                <MaybeAddTooltip
+                                  key="other"
+                                  option={
+                                    Object {
+                                      "disabled": undefined,
+                                      "displayText": "Other",
+                                      "value": "other",
+                                    }
+                                  }
                                 >
-                                  <input
-                                    checked={true}
-                                    disabled={false}
-                                    id="hearingTime0_other"
-                                    name="hearingTime0"
-                                    onChange={[Function]}
-                                    type="radio"
-                                    value="other"
-                                  />
-                                  <label
-                                    className=""
-                                    htmlFor="hearingTime0_other"
+                                  <div
+                                    className="cf-form-radio-option"
+                                    key="hearingTime0-other-2"
                                   >
-                                    Other
-                                  </label>
-                                </div>
+                                    <RadioInput
+                                      controlled={true}
+                                      handleChange={[Function]}
+                                      idPart="hearingTime0"
+                                      name="hearingTime0"
+                                      option={
+                                        Object {
+                                          "disabled": undefined,
+                                          "displayText": "Other",
+                                          "value": "other",
+                                        }
+                                      }
+                                      value="other"
+                                    >
+                                      <input
+                                        checked={true}
+                                        disabled={false}
+                                        id="hearingTime0_other"
+                                        name="hearingTime0"
+                                        onChange={[Function]}
+                                        type="radio"
+                                        value="other"
+                                      />
+                                    </RadioInput>
+                                    <label
+                                      className=""
+                                      htmlFor="hearingTime0_other"
+                                    >
+                                      Other
+                                    </label>
+                                  </div>
+                                </MaybeAddTooltip>
                               </div>
                             </fieldset>
                           </RadioField>
@@ -231911,66 +232223,144 @@ SAN FRANCISCO, CA 94103
                               <div
                                 className="cf-form-radio-options"
                               >
-                                <div
-                                  className="cf-form-radio-option"
-                                  key="hearingTime0-08:30-0"
+                                <MaybeAddTooltip
+                                  key="08:30"
+                                  option={
+                                    Object {
+                                      "disabled": undefined,
+                                      "displayText": "8:30 AM Eastern Time (US & Canada)",
+                                      "value": "08:30",
+                                    }
+                                  }
                                 >
-                                  <input
-                                    checked={false}
-                                    disabled={false}
-                                    id="hearingTime0_08:30"
-                                    name="hearingTime0"
-                                    onChange={[Function]}
-                                    type="radio"
-                                    value="08:30"
-                                  />
-                                  <label
-                                    className=""
-                                    htmlFor="hearingTime0_08:30"
+                                  <div
+                                    className="cf-form-radio-option"
+                                    key="hearingTime0-08:30-0"
                                   >
-                                    8:30 AM Eastern Time (US & Canada)
-                                  </label>
-                                </div>
-                                <div
-                                  className="cf-form-radio-option"
-                                  key="hearingTime0-12:30-1"
+                                    <RadioInput
+                                      controlled={true}
+                                      handleChange={[Function]}
+                                      idPart="hearingTime0"
+                                      name="hearingTime0"
+                                      option={
+                                        Object {
+                                          "disabled": undefined,
+                                          "displayText": "8:30 AM Eastern Time (US & Canada)",
+                                          "value": "08:30",
+                                        }
+                                      }
+                                      value="other"
+                                    >
+                                      <input
+                                        checked={false}
+                                        disabled={false}
+                                        id="hearingTime0_08:30"
+                                        name="hearingTime0"
+                                        onChange={[Function]}
+                                        type="radio"
+                                        value="08:30"
+                                      />
+                                    </RadioInput>
+                                    <label
+                                      className=""
+                                      htmlFor="hearingTime0_08:30"
+                                    >
+                                      8:30 AM Eastern Time (US & Canada)
+                                    </label>
+                                  </div>
+                                </MaybeAddTooltip>
+                                <MaybeAddTooltip
+                                  key="12:30"
+                                  option={
+                                    Object {
+                                      "disabled": undefined,
+                                      "displayText": "12:30 PM Eastern Time (US & Canada)",
+                                      "value": "12:30",
+                                    }
+                                  }
                                 >
-                                  <input
-                                    checked={false}
-                                    disabled={false}
-                                    id="hearingTime0_12:30"
-                                    name="hearingTime0"
-                                    onChange={[Function]}
-                                    type="radio"
-                                    value="12:30"
-                                  />
-                                  <label
-                                    className=""
-                                    htmlFor="hearingTime0_12:30"
+                                  <div
+                                    className="cf-form-radio-option"
+                                    key="hearingTime0-12:30-1"
                                   >
-                                    12:30 PM Eastern Time (US & Canada)
-                                  </label>
-                                </div>
-                                <div
-                                  className="cf-form-radio-option"
-                                  key="hearingTime0-other-2"
+                                    <RadioInput
+                                      controlled={true}
+                                      handleChange={[Function]}
+                                      idPart="hearingTime0"
+                                      name="hearingTime0"
+                                      option={
+                                        Object {
+                                          "disabled": undefined,
+                                          "displayText": "12:30 PM Eastern Time (US & Canada)",
+                                          "value": "12:30",
+                                        }
+                                      }
+                                      value="other"
+                                    >
+                                      <input
+                                        checked={false}
+                                        disabled={false}
+                                        id="hearingTime0_12:30"
+                                        name="hearingTime0"
+                                        onChange={[Function]}
+                                        type="radio"
+                                        value="12:30"
+                                      />
+                                    </RadioInput>
+                                    <label
+                                      className=""
+                                      htmlFor="hearingTime0_12:30"
+                                    >
+                                      12:30 PM Eastern Time (US & Canada)
+                                    </label>
+                                  </div>
+                                </MaybeAddTooltip>
+                                <MaybeAddTooltip
+                                  key="other"
+                                  option={
+                                    Object {
+                                      "disabled": undefined,
+                                      "displayText": "Other",
+                                      "value": "other",
+                                    }
+                                  }
                                 >
-                                  <input
-                                    checked={true}
-                                    disabled={false}
-                                    id="hearingTime0_other"
-                                    name="hearingTime0"
-                                    onChange={[Function]}
-                                    type="radio"
-                                    value="other"
-                                  />
-                                  <label
-                                    className=""
-                                    htmlFor="hearingTime0_other"
+                                  <div
+                                    className="cf-form-radio-option"
+                                    key="hearingTime0-other-2"
                                   >
-                                    Other
-                                  </label>
-                                </div>
+                                    <RadioInput
+                                      controlled={true}
+                                      handleChange={[Function]}
+                                      idPart="hearingTime0"
+                                      name="hearingTime0"
+                                      option={
+                                        Object {
+                                          "disabled": undefined,
+                                          "displayText": "Other",
+                                          "value": "other",
+                                        }
+                                      }
+                                      value="other"
+                                    >
+                                      <input
+                                        checked={true}
+                                        disabled={false}
+                                        id="hearingTime0_other"
+                                        name="hearingTime0"
+                                        onChange={[Function]}
+                                        type="radio"
+                                        value="other"
+                                      />
+                                    </RadioInput>
+                                    <label
+                                      className=""
+                                      htmlFor="hearingTime0_other"
+                                    >
+                                      Other
+                                    </label>
+                                  </div>
+                                </MaybeAddTooltip>
                               </div>
                             </fieldset>
                           </RadioField>
@@ -269211,66 +269601,144 @@ SAN FRANCISCO, CA 94103
                               <div
                                 className="cf-form-radio-options"
                               >
-                                <div
-                                  className="cf-form-radio-option"
-                                  key="hearingTime0-08:30-0"
+                                <MaybeAddTooltip
+                                  key="08:30"
+                                  option={
+                                    Object {
+                                      "disabled": undefined,
+                                      "displayText": "8:30 AM Eastern Time (US & Canada)",
+                                      "value": "08:30",
+                                    }
+                                  }
                                 >
-                                  <input
-                                    checked={false}
-                                    disabled={false}
-                                    id="hearingTime0_08:30"
-                                    name="hearingTime0"
-                                    onChange={[Function]}
-                                    type="radio"
-                                    value="08:30"
-                                  />
-                                  <label
-                                    className=""
-                                    htmlFor="hearingTime0_08:30"
+                                  <div
+                                    className="cf-form-radio-option"
+                                    key="hearingTime0-08:30-0"
                                   >
-                                    8:30 AM Eastern Time (US & Canada)
-                                  </label>
-                                </div>
-                                <div
-                                  className="cf-form-radio-option"
-                                  key="hearingTime0-12:30-1"
+                                    <RadioInput
+                                      controlled={true}
+                                      handleChange={[Function]}
+                                      idPart="hearingTime0"
+                                      name="hearingTime0"
+                                      option={
+                                        Object {
+                                          "disabled": undefined,
+                                          "displayText": "8:30 AM Eastern Time (US & Canada)",
+                                          "value": "08:30",
+                                        }
+                                      }
+                                      value="other"
+                                    >
+                                      <input
+                                        checked={false}
+                                        disabled={false}
+                                        id="hearingTime0_08:30"
+                                        name="hearingTime0"
+                                        onChange={[Function]}
+                                        type="radio"
+                                        value="08:30"
+                                      />
+                                    </RadioInput>
+                                    <label
+                                      className=""
+                                      htmlFor="hearingTime0_08:30"
+                                    >
+                                      8:30 AM Eastern Time (US & Canada)
+                                    </label>
+                                  </div>
+                                </MaybeAddTooltip>
+                                <MaybeAddTooltip
+                                  key="12:30"
+                                  option={
+                                    Object {
+                                      "disabled": undefined,
+                                      "displayText": "12:30 PM Eastern Time (US & Canada)",
+                                      "value": "12:30",
+                                    }
+                                  }
                                 >
-                                  <input
-                                    checked={false}
-                                    disabled={false}
-                                    id="hearingTime0_12:30"
-                                    name="hearingTime0"
-                                    onChange={[Function]}
-                                    type="radio"
-                                    value="12:30"
-                                  />
-                                  <label
-                                    className=""
-                                    htmlFor="hearingTime0_12:30"
+                                  <div
+                                    className="cf-form-radio-option"
+                                    key="hearingTime0-12:30-1"
                                   >
-                                    12:30 PM Eastern Time (US & Canada)
-                                  </label>
-                                </div>
-                                <div
-                                  className="cf-form-radio-option"
-                                  key="hearingTime0-other-2"
+                                    <RadioInput
+                                      controlled={true}
+                                      handleChange={[Function]}
+                                      idPart="hearingTime0"
+                                      name="hearingTime0"
+                                      option={
+                                        Object {
+                                          "disabled": undefined,
+                                          "displayText": "12:30 PM Eastern Time (US & Canada)",
+                                          "value": "12:30",
+                                        }
+                                      }
+                                      value="other"
+                                    >
+                                      <input
+                                        checked={false}
+                                        disabled={false}
+                                        id="hearingTime0_12:30"
+                                        name="hearingTime0"
+                                        onChange={[Function]}
+                                        type="radio"
+                                        value="12:30"
+                                      />
+                                    </RadioInput>
+                                    <label
+                                      className=""
+                                      htmlFor="hearingTime0_12:30"
+                                    >
+                                      12:30 PM Eastern Time (US & Canada)
+                                    </label>
+                                  </div>
+                                </MaybeAddTooltip>
+                                <MaybeAddTooltip
+                                  key="other"
+                                  option={
+                                    Object {
+                                      "disabled": undefined,
+                                      "displayText": "Other",
+                                      "value": "other",
+                                    }
+                                  }
                                 >
-                                  <input
-                                    checked={true}
-                                    disabled={false}
-                                    id="hearingTime0_other"
-                                    name="hearingTime0"
-                                    onChange={[Function]}
-                                    type="radio"
-                                    value="other"
-                                  />
-                                  <label
-                                    className=""
-                                    htmlFor="hearingTime0_other"
+                                  <div
+                                    className="cf-form-radio-option"
+                                    key="hearingTime0-other-2"
                                   >
-                                    Other
-                                  </label>
-                                </div>
+                                    <RadioInput
+                                      controlled={true}
+                                      handleChange={[Function]}
+                                      idPart="hearingTime0"
+                                      name="hearingTime0"
+                                      option={
+                                        Object {
+                                          "disabled": undefined,
+                                          "displayText": "Other",
+                                          "value": "other",
+                                        }
+                                      }
+                                      value="other"
+                                    >
+                                      <input
+                                        checked={true}
+                                        disabled={false}
+                                        id="hearingTime0_other"
+                                        name="hearingTime0"
+                                        onChange={[Function]}
+                                        type="radio"
+                                        value="other"
+                                      />
+                                    </RadioInput>
+                                    <label
+                                      className=""
+                                      htmlFor="hearingTime0_other"
+                                    >
+                                      Other
+                                    </label>
+                                  </div>
+                                </MaybeAddTooltip>
                               </div>
                             </fieldset>
                           </RadioField>
@@ -335645,66 +336113,144 @@ SAN FRANCISCO, CA 94103
                               <div
                                 className="cf-form-radio-options"
                               >
-                                <div
-                                  className="cf-form-radio-option"
-                                  key="hearingTime0-08:30-0"
+                                <MaybeAddTooltip
+                                  key="08:30"
+                                  option={
+                                    Object {
+                                      "disabled": undefined,
+                                      "displayText": "8:30 AM Eastern Time (US & Canada)",
+                                      "value": "08:30",
+                                    }
+                                  }
                                 >
-                                  <input
-                                    checked={false}
-                                    disabled={false}
-                                    id="hearingTime0_08:30"
-                                    name="hearingTime0"
-                                    onChange={[Function]}
-                                    type="radio"
-                                    value="08:30"
-                                  />
-                                  <label
-                                    className=""
-                                    htmlFor="hearingTime0_08:30"
+                                  <div
+                                    className="cf-form-radio-option"
+                                    key="hearingTime0-08:30-0"
                                   >
-                                    8:30 AM Eastern Time (US & Canada)
-                                  </label>
-                                </div>
-                                <div
-                                  className="cf-form-radio-option"
-                                  key="hearingTime0-12:30-1"
+                                    <RadioInput
+                                      controlled={true}
+                                      handleChange={[Function]}
+                                      idPart="hearingTime0"
+                                      name="hearingTime0"
+                                      option={
+                                        Object {
+                                          "disabled": undefined,
+                                          "displayText": "8:30 AM Eastern Time (US & Canada)",
+                                          "value": "08:30",
+                                        }
+                                      }
+                                      value="other"
+                                    >
+                                      <input
+                                        checked={false}
+                                        disabled={false}
+                                        id="hearingTime0_08:30"
+                                        name="hearingTime0"
+                                        onChange={[Function]}
+                                        type="radio"
+                                        value="08:30"
+                                      />
+                                    </RadioInput>
+                                    <label
+                                      className=""
+                                      htmlFor="hearingTime0_08:30"
+                                    >
+                                      8:30 AM Eastern Time (US & Canada)
+                                    </label>
+                                  </div>
+                                </MaybeAddTooltip>
+                                <MaybeAddTooltip
+                                  key="12:30"
+                                  option={
+                                    Object {
+                                      "disabled": undefined,
+                                      "displayText": "12:30 PM Eastern Time (US & Canada)",
+                                      "value": "12:30",
+                                    }
+                                  }
                                 >
-                                  <input
-                                    checked={false}
-                                    disabled={false}
-                                    id="hearingTime0_12:30"
-                                    name="hearingTime0"
-                                    onChange={[Function]}
-                                    type="radio"
-                                    value="12:30"
-                                  />
-                                  <label
-                                    className=""
-                                    htmlFor="hearingTime0_12:30"
+                                  <div
+                                    className="cf-form-radio-option"
+                                    key="hearingTime0-12:30-1"
                                   >
-                                    12:30 PM Eastern Time (US & Canada)
-                                  </label>
-                                </div>
-                                <div
-                                  className="cf-form-radio-option"
-                                  key="hearingTime0-other-2"
+                                    <RadioInput
+                                      controlled={true}
+                                      handleChange={[Function]}
+                                      idPart="hearingTime0"
+                                      name="hearingTime0"
+                                      option={
+                                        Object {
+                                          "disabled": undefined,
+                                          "displayText": "12:30 PM Eastern Time (US & Canada)",
+                                          "value": "12:30",
+                                        }
+                                      }
+                                      value="other"
+                                    >
+                                      <input
+                                        checked={false}
+                                        disabled={false}
+                                        id="hearingTime0_12:30"
+                                        name="hearingTime0"
+                                        onChange={[Function]}
+                                        type="radio"
+                                        value="12:30"
+                                      />
+                                    </RadioInput>
+                                    <label
+                                      className=""
+                                      htmlFor="hearingTime0_12:30"
+                                    >
+                                      12:30 PM Eastern Time (US & Canada)
+                                    </label>
+                                  </div>
+                                </MaybeAddTooltip>
+                                <MaybeAddTooltip
+                                  key="other"
+                                  option={
+                                    Object {
+                                      "disabled": undefined,
+                                      "displayText": "Other",
+                                      "value": "other",
+                                    }
+                                  }
                                 >
-                                  <input
-                                    checked={true}
-                                    disabled={false}
-                                    id="hearingTime0_other"
-                                    name="hearingTime0"
-                                    onChange={[Function]}
-                                    type="radio"
-                                    value="other"
-                                  />
-                                  <label
-                                    className=""
-                                    htmlFor="hearingTime0_other"
+                                  <div
+                                    className="cf-form-radio-option"
+                                    key="hearingTime0-other-2"
                                   >
-                                    Other
-                                  </label>
-                                </div>
+                                    <RadioInput
+                                      controlled={true}
+                                      handleChange={[Function]}
+                                      idPart="hearingTime0"
+                                      name="hearingTime0"
+                                      option={
+                                        Object {
+                                          "disabled": undefined,
+                                          "displayText": "Other",
+                                          "value": "other",
+                                        }
+                                      }
+                                      value="other"
+                                    >
+                                      <input
+                                        checked={true}
+                                        disabled={false}
+                                        id="hearingTime0_other"
+                                        name="hearingTime0"
+                                        onChange={[Function]}
+                                        type="radio"
+                                        value="other"
+                                      />
+                                    </RadioInput>
+                                    <label
+                                      className=""
+                                      htmlFor="hearingTime0_other"
+                                    >
+                                      Other
+                                    </label>
+                                  </div>
+                                </MaybeAddTooltip>
                               </div>
                             </fieldset>
                           </RadioField>
@@ -404518,66 +405064,144 @@ SAN FRANCISCO, CA 94103
                               <div
                                 className="cf-form-radio-options"
                               >
-                                <div
-                                  className="cf-form-radio-option"
-                                  key="hearingTime0-08:30-0"
+                                <MaybeAddTooltip
+                                  key="08:30"
+                                  option={
+                                    Object {
+                                      "disabled": undefined,
+                                      "displayText": "8:30 AM Eastern Time (US & Canada)",
+                                      "value": "08:30",
+                                    }
+                                  }
                                 >
-                                  <input
-                                    checked={false}
-                                    disabled={false}
-                                    id="hearingTime0_08:30"
-                                    name="hearingTime0"
-                                    onChange={[Function]}
-                                    type="radio"
-                                    value="08:30"
-                                  />
-                                  <label
-                                    className=""
-                                    htmlFor="hearingTime0_08:30"
+                                  <div
+                                    className="cf-form-radio-option"
+                                    key="hearingTime0-08:30-0"
                                   >
-                                    8:30 AM Eastern Time (US & Canada)
-                                  </label>
-                                </div>
-                                <div
-                                  className="cf-form-radio-option"
-                                  key="hearingTime0-12:30-1"
+                                    <RadioInput
+                                      controlled={true}
+                                      handleChange={[Function]}
+                                      idPart="hearingTime0"
+                                      name="hearingTime0"
+                                      option={
+                                        Object {
+                                          "disabled": undefined,
+                                          "displayText": "8:30 AM Eastern Time (US & Canada)",
+                                          "value": "08:30",
+                                        }
+                                      }
+                                      value="other"
+                                    >
+                                      <input
+                                        checked={false}
+                                        disabled={false}
+                                        id="hearingTime0_08:30"
+                                        name="hearingTime0"
+                                        onChange={[Function]}
+                                        type="radio"
+                                        value="08:30"
+                                      />
+                                    </RadioInput>
+                                    <label
+                                      className=""
+                                      htmlFor="hearingTime0_08:30"
+                                    >
+                                      8:30 AM Eastern Time (US & Canada)
+                                    </label>
+                                  </div>
+                                </MaybeAddTooltip>
+                                <MaybeAddTooltip
+                                  key="12:30"
+                                  option={
+                                    Object {
+                                      "disabled": undefined,
+                                      "displayText": "12:30 PM Eastern Time (US & Canada)",
+                                      "value": "12:30",
+                                    }
+                                  }
                                 >
-                                  <input
-                                    checked={false}
-                                    disabled={false}
-                                    id="hearingTime0_12:30"
-                                    name="hearingTime0"
-                                    onChange={[Function]}
-                                    type="radio"
-                                    value="12:30"
-                                  />
-                                  <label
-                                    className=""
-                                    htmlFor="hearingTime0_12:30"
+                                  <div
+                                    className="cf-form-radio-option"
+                                    key="hearingTime0-12:30-1"
                                   >
-                                    12:30 PM Eastern Time (US & Canada)
-                                  </label>
-                                </div>
-                                <div
-                                  className="cf-form-radio-option"
-                                  key="hearingTime0-other-2"
+                                    <RadioInput
+                                      controlled={true}
+                                      handleChange={[Function]}
+                                      idPart="hearingTime0"
+                                      name="hearingTime0"
+                                      option={
+                                        Object {
+                                          "disabled": undefined,
+                                          "displayText": "12:30 PM Eastern Time (US & Canada)",
+                                          "value": "12:30",
+                                        }
+                                      }
+                                      value="other"
+                                    >
+                                      <input
+                                        checked={false}
+                                        disabled={false}
+                                        id="hearingTime0_12:30"
+                                        name="hearingTime0"
+                                        onChange={[Function]}
+                                        type="radio"
+                                        value="12:30"
+                                      />
+                                    </RadioInput>
+                                    <label
+                                      className=""
+                                      htmlFor="hearingTime0_12:30"
+                                    >
+                                      12:30 PM Eastern Time (US & Canada)
+                                    </label>
+                                  </div>
+                                </MaybeAddTooltip>
+                                <MaybeAddTooltip
+                                  key="other"
+                                  option={
+                                    Object {
+                                      "disabled": undefined,
+                                      "displayText": "Other",
+                                      "value": "other",
+                                    }
+                                  }
                                 >
-                                  <input
-                                    checked={true}
-                                    disabled={false}
-                                    id="hearingTime0_other"
-                                    name="hearingTime0"
-                                    onChange={[Function]}
-                                    type="radio"
-                                    value="other"
-                                  />
-                                  <label
-                                    className=""
-                                    htmlFor="hearingTime0_other"
+                                  <div
+                                    className="cf-form-radio-option"
+                                    key="hearingTime0-other-2"
                                   >
-                                    Other
-                                  </label>
-                                </div>
+                                    <RadioInput
+                                      controlled={true}
+                                      handleChange={[Function]}
+                                      idPart="hearingTime0"
+                                      name="hearingTime0"
+                                      option={
+                                        Object {
+                                          "disabled": undefined,
+                                          "displayText": "Other",
+                                          "value": "other",
+                                        }
+                                      }
+                                      value="other"
+                                    >
+                                      <input
+                                        checked={true}
+                                        disabled={false}
+                                        id="hearingTime0_other"
+                                        name="hearingTime0"
+                                        onChange={[Function]}
+                                        type="radio"
+                                        value="other"
+                                      />
+                                    </RadioInput>
+                                    <label
+                                      className=""
+                                      htmlFor="hearingTime0_other"
+                                    >
+                                      Other
+                                    </label>
+                                  </div>
+                                </MaybeAddTooltip>
                               </div>
                             </fieldset>
                           </RadioField>
@@ -475611,66 +476235,144 @@ SAN FRANCISCO, CA 94103
                               <div
                                 className="cf-form-radio-options"
                               >
-                                <div
-                                  className="cf-form-radio-option"
-                                  key="hearingTime0-08:30-0"
+                                <MaybeAddTooltip
+                                  key="08:30"
+                                  option={
+                                    Object {
+                                      "disabled": undefined,
+                                      "displayText": "8:30 AM Eastern Time (US & Canada)",
+                                      "value": "08:30",
+                                    }
+                                  }
                                 >
-                                  <input
-                                    checked={false}
-                                    disabled={false}
-                                    id="hearingTime0_08:30"
-                                    name="hearingTime0"
-                                    onChange={[Function]}
-                                    type="radio"
-                                    value="08:30"
-                                  />
-                                  <label
-                                    className=""
-                                    htmlFor="hearingTime0_08:30"
+                                  <div
+                                    className="cf-form-radio-option"
+                                    key="hearingTime0-08:30-0"
                                   >
-                                    8:30 AM Eastern Time (US & Canada)
-                                  </label>
-                                </div>
-                                <div
-                                  className="cf-form-radio-option"
-                                  key="hearingTime0-12:30-1"
+                                    <RadioInput
+                                      controlled={true}
+                                      handleChange={[Function]}
+                                      idPart="hearingTime0"
+                                      name="hearingTime0"
+                                      option={
+                                        Object {
+                                          "disabled": undefined,
+                                          "displayText": "8:30 AM Eastern Time (US & Canada)",
+                                          "value": "08:30",
+                                        }
+                                      }
+                                      value="other"
+                                    >
+                                      <input
+                                        checked={false}
+                                        disabled={false}
+                                        id="hearingTime0_08:30"
+                                        name="hearingTime0"
+                                        onChange={[Function]}
+                                        type="radio"
+                                        value="08:30"
+                                      />
+                                    </RadioInput>
+                                    <label
+                                      className=""
+                                      htmlFor="hearingTime0_08:30"
+                                    >
+                                      8:30 AM Eastern Time (US & Canada)
+                                    </label>
+                                  </div>
+                                </MaybeAddTooltip>
+                                <MaybeAddTooltip
+                                  key="12:30"
+                                  option={
+                                    Object {
+                                      "disabled": undefined,
+                                      "displayText": "12:30 PM Eastern Time (US & Canada)",
+                                      "value": "12:30",
+                                    }
+                                  }
                                 >
-                                  <input
-                                    checked={false}
-                                    disabled={false}
-                                    id="hearingTime0_12:30"
-                                    name="hearingTime0"
-                                    onChange={[Function]}
-                                    type="radio"
-                                    value="12:30"
-                                  />
-                                  <label
-                                    className=""
-                                    htmlFor="hearingTime0_12:30"
+                                  <div
+                                    className="cf-form-radio-option"
+                                    key="hearingTime0-12:30-1"
                                   >
-                                    12:30 PM Eastern Time (US & Canada)
-                                  </label>
-                                </div>
-                                <div
-                                  className="cf-form-radio-option"
-                                  key="hearingTime0-other-2"
+                                    <RadioInput
+                                      controlled={true}
+                                      handleChange={[Function]}
+                                      idPart="hearingTime0"
+                                      name="hearingTime0"
+                                      option={
+                                        Object {
+                                          "disabled": undefined,
+                                          "displayText": "12:30 PM Eastern Time (US & Canada)",
+                                          "value": "12:30",
+                                        }
+                                      }
+                                      value="other"
+                                    >
+                                      <input
+                                        checked={false}
+                                        disabled={false}
+                                        id="hearingTime0_12:30"
+                                        name="hearingTime0"
+                                        onChange={[Function]}
+                                        type="radio"
+                                        value="12:30"
+                                      />
+                                    </RadioInput>
+                                    <label
+                                      className=""
+                                      htmlFor="hearingTime0_12:30"
+                                    >
+                                      12:30 PM Eastern Time (US & Canada)
+                                    </label>
+                                  </div>
+                                </MaybeAddTooltip>
+                                <MaybeAddTooltip
+                                  key="other"
+                                  option={
+                                    Object {
+                                      "disabled": undefined,
+                                      "displayText": "Other",
+                                      "value": "other",
+                                    }
+                                  }
                                 >
-                                  <input
-                                    checked={true}
-                                    disabled={false}
-                                    id="hearingTime0_other"
-                                    name="hearingTime0"
-                                    onChange={[Function]}
-                                    type="radio"
-                                    value="other"
-                                  />
-                                  <label
-                                    className=""
-                                    htmlFor="hearingTime0_other"
+                                  <div
+                                    className="cf-form-radio-option"
+                                    key="hearingTime0-other-2"
                                   >
-                                    Other
-                                  </label>
-                                </div>
+                                    <RadioInput
+                                      controlled={true}
+                                      handleChange={[Function]}
+                                      idPart="hearingTime0"
+                                      name="hearingTime0"
+                                      option={
+                                        Object {
+                                          "disabled": undefined,
+                                          "displayText": "Other",
+                                          "value": "other",
+                                        }
+                                      }
+                                      value="other"
+                                    >
+                                      <input
+                                        checked={true}
+                                        disabled={false}
+                                        id="hearingTime0_other"
+                                        name="hearingTime0"
+                                        onChange={[Function]}
+                                        type="radio"
+                                        value="other"
+                                      />
+                                    </RadioInput>
+                                    <label
+                                      className=""
+                                      htmlFor="hearingTime0_other"
+                                    >
+                                      Other
+                                    </label>
+                                  </div>
+                                </MaybeAddTooltip>
                               </div>
                             </fieldset>
                           </RadioField>
diff --git a/client/test/app/hearings/components/details/__snapshots__/DetailsForm.test.js.snap b/client/test/app/hearings/components/details/__snapshots__/DetailsForm.test.js.snap
index 47155ee3647..de736b1dd81 100644
--- a/client/test/app/hearings/components/details/__snapshots__/DetailsForm.test.js.snap
+++ b/client/test/app/hearings/components/details/__snapshots__/DetailsForm.test.js.snap
@@ -45170,86 +45170,190 @@ exports[`DetailsForm Matches snapshot with default props when passed in 1`] = `
                   <div
                     className="cf-form-radio-options"
                   >
-                    <div
-                      className="cf-form-radio-option"
-                      key="requestedRemedy-Proceed without transcript-0"
+                    <MaybeAddTooltip
+                      key="Proceed without transcript"
+                      option={
+                        Object {
+                          "disabled": true,
+                          "displayText": "Proceed without transcript",
+                          "value": "Proceed without transcript",
+                        }
+                      }
                     >
-                      <input
-                        checked={false}
-                        disabled={true}
-                        id="requestedRemedy_Proceed without transcript"
-                        name="requestedRemedy"
-                        onChange={[Function]}
-                        type="radio"
-                        value="Proceed without transcript"
-                      />
-                      <label
-                        className="disabled"
-                        htmlFor="requestedRemedy_Proceed without transcript"
+                      <div
+                        className="cf-form-radio-option"
+                        key="requestedRemedy-Proceed without transcript-0"
                       >
-                        Proceed without transcript
-                      </label>
-                    </div>
-                    <div
-                      className="cf-form-radio-option"
-                      key="requestedRemedy-Proceed with partial transcript-1"
+                        <RadioInput
+                          controlled={true}
+                          handleChange={[Function]}
+                          idPart="requestedRemedy"
+                          name="requestedRemedy"
+                          option={
+                            Object {
+                              "disabled": true,
+                              "displayText": "Proceed without transcript",
+                              "value": "Proceed without transcript",
+                            }
+                          }
+                          value=""
+                        >
+                          <input
+                            checked={false}
+                            disabled={true}
+                            id="requestedRemedy_Proceed without transcript"
+                            name="requestedRemedy"
+                            onChange={[Function]}
+                            type="radio"
+                            value="Proceed without transcript"
+                          />
+                        </RadioInput>
+                        <label
+                          className="disabled"
+                          htmlFor="requestedRemedy_Proceed without transcript"
+                        >
+                          Proceed without transcript
+                        </label>
+                      </div>
+                    </MaybeAddTooltip>
+                    <MaybeAddTooltip
+                      key="Proceed with partial transcript"
+                      option={
+                        Object {
+                          "disabled": true,
+                          "displayText": "Proceed with partial transcript",
+                          "value": "Proceed with partial transcript",
+                        }
+                      }
                     >
-                      <input
-                        checked={false}
-                        disabled={true}
-                        id="requestedRemedy_Proceed with partial transcript"
-                        name="requestedRemedy"
-                        onChange={[Function]}
-                        type="radio"
-                        value="Proceed with partial transcript"
-                      />
-                      <label
-                        className="disabled"
-                        htmlFor="requestedRemedy_Proceed with partial transcript"
+                      <div
+                        className="cf-form-radio-option"
+                        key="requestedRemedy-Proceed with partial transcript-1"
                       >
-                        Proceed with partial transcript
-                      </label>
-                    </div>
-                    <div
-                      className="cf-form-radio-option"
-                      key="requestedRemedy-New hearing-2"
+                        <RadioInput
+                          controlled={true}
+                          handleChange={[Function]}
+                          idPart="requestedRemedy"
+                          name="requestedRemedy"
+                          option={
+                            Object {
+                              "disabled": true,
+                              "displayText": "Proceed with partial transcript",
+                              "value": "Proceed with partial transcript",
+                            }
+                          }
+                          value=""
+                        >
+                          <input
+                            checked={false}
+                            disabled={true}
+                            id="requestedRemedy_Proceed with partial transcript"
+                            name="requestedRemedy"
+                            onChange={[Function]}
+                            type="radio"
+                            value="Proceed with partial transcript"
+                          />
+                        </RadioInput>
+                        <label
+                          className="disabled"
+                          htmlFor="requestedRemedy_Proceed with partial transcript"
+                        >
+                          Proceed with partial transcript
+                        </label>
+                      </div>
+                    </MaybeAddTooltip>
+                    <MaybeAddTooltip
+                      key="New hearing"
+                      option={
+                        Object {
+                          "disabled": true,
+                          "displayText": "New hearing",
+                          "value": "New hearing",
+                        }
+                      }
                     >
-                      <input
-                        checked={false}
-                        disabled={true}
-                        id="requestedRemedy_New hearing"
-                        name="requestedRemedy"
-                        onChange={[Function]}
-                        type="radio"
-                        value="New hearing"
-                      />
-                      <label
-                        className="disabled"
-                        htmlFor="requestedRemedy_New hearing"
+                      <div
+                        className="cf-form-radio-option"
+                        key="requestedRemedy-New hearing-2"
                       >
-                        New hearing
-                      </label>
-                    </div>
-                    <div
-                      className="cf-form-radio-option"
-                      key="requestedRemedy--3"
+                        <RadioInput
+                          controlled={true}
+                          handleChange={[Function]}
+                          idPart="requestedRemedy"
+                          name="requestedRemedy"
+                          option={
+                            Object {
+                              "disabled": true,
+                              "displayText": "New hearing",
+                              "value": "New hearing",
+                            }
+                          }
+                          value=""
+                        >
+                          <input
+                            checked={false}
+                            disabled={true}
+                            id="requestedRemedy_New hearing"
+                            name="requestedRemedy"
+                            onChange={[Function]}
+                            type="radio"
+                            value="New hearing"
+                          />
+                        </RadioInput>
+                        <label
+                          className="disabled"
+                          htmlFor="requestedRemedy_New hearing"
+                        >
+                          New hearing
+                        </label>
+                      </div>
+                    </MaybeAddTooltip>
+                    <MaybeAddTooltip
+                      key=""
+                      option={
+                        Object {
+                          "disabled": true,
+                          "displayText": "None",
+                          "value": "",
+                        }
+                      }
                     >
-                      <input
-                        checked={true}
-                        disabled={true}
-                        id="requestedRemedy_"
-                        name="requestedRemedy"
-                        onChange={[Function]}
-                        type="radio"
-                        value=""
-                      />
-                      <label
-                        className="disabled"
-                        htmlFor="requestedRemedy_"
+                      <div
+                        className="cf-form-radio-option"
+                        key="requestedRemedy--3"
                       >
-                        None
-                      </label>
-                    </div>
+                        <RadioInput
+                          controlled={true}
+                          handleChange={[Function]}
+                          idPart="requestedRemedy"
+                          name="requestedRemedy"
+                          option={
+                            Object {
+                              "disabled": true,
+                              "displayText": "None",
+                              "value": "",
+                            }
+                          }
+                          value=""
+                        >
+                          <input
+                            checked={true}
+                            disabled={true}
+                            id="requestedRemedy_"
+                            name="requestedRemedy"
+                            onChange={[Function]}
+                            type="radio"
+                            value=""
+                          />
+                        </RadioInput>
+                        <label
+                          className="disabled"
+                          htmlFor="requestedRemedy_"
+                        >
+                          None
+                        </label>
+                      </div>
+                    </MaybeAddTooltip>
                   </div>
                 </fieldset>
               </RadioField>
@@ -90644,86 +90748,190 @@ exports[`DetailsForm Matches snapshot with for AMA hearing 1`] = `
                   <div
                     className="cf-form-radio-options"
                   >
-                    <div
-                      className="cf-form-radio-option"
-                      key="requestedRemedy-Proceed without transcript-0"
+                    <MaybeAddTooltip
+                      key="Proceed without transcript"
+                      option={
+                        Object {
+                          "disabled": true,
+                          "displayText": "Proceed without transcript",
+                          "value": "Proceed without transcript",
+                        }
+                      }
                     >
-                      <input
-                        checked={false}
-                        disabled={true}
-                        id="requestedRemedy_Proceed without transcript"
-                        name="requestedRemedy"
-                        onChange={[Function]}
-                        type="radio"
-                        value="Proceed without transcript"
-                      />
-                      <label
-                        className="disabled"
-                        htmlFor="requestedRemedy_Proceed without transcript"
+                      <div
+                        className="cf-form-radio-option"
+                        key="requestedRemedy-Proceed without transcript-0"
                       >
-                        Proceed without transcript
-                      </label>
-                    </div>
-                    <div
-                      className="cf-form-radio-option"
-                      key="requestedRemedy-Proceed with partial transcript-1"
+                        <RadioInput
+                          controlled={true}
+                          handleChange={[Function]}
+                          idPart="requestedRemedy"
+                          name="requestedRemedy"
+                          option={
+                            Object {
+                              "disabled": true,
+                              "displayText": "Proceed without transcript",
+                              "value": "Proceed without transcript",
+                            }
+                          }
+                          value=""
+                        >
+                          <input
+                            checked={false}
+                            disabled={true}
+                            id="requestedRemedy_Proceed without transcript"
+                            name="requestedRemedy"
+                            onChange={[Function]}
+                            type="radio"
+                            value="Proceed without transcript"
+                          />
+                        </RadioInput>
+                        <label
+                          className="disabled"
+                          htmlFor="requestedRemedy_Proceed without transcript"
+                        >
+                          Proceed without transcript
+                        </label>
+                      </div>
+                    </MaybeAddTooltip>
+                    <MaybeAddTooltip
+                      key="Proceed with partial transcript"
+                      option={
+                        Object {
+                          "disabled": true,
+                          "displayText": "Proceed with partial transcript",
+                          "value": "Proceed with partial transcript",
+                        }
+                      }
                     >
-                      <input
-                        checked={false}
-                        disabled={true}
-                        id="requestedRemedy_Proceed with partial transcript"
-                        name="requestedRemedy"
-                        onChange={[Function]}
-                        type="radio"
-                        value="Proceed with partial transcript"
-                      />
-                      <label
-                        className="disabled"
-                        htmlFor="requestedRemedy_Proceed with partial transcript"
+                      <div
+                        className="cf-form-radio-option"
+                        key="requestedRemedy-Proceed with partial transcript-1"
                       >
-                        Proceed with partial transcript
-                      </label>
-                    </div>
-                    <div
-                      className="cf-form-radio-option"
-                      key="requestedRemedy-New hearing-2"
+                        <RadioInput
+                          controlled={true}
+                          handleChange={[Function]}
+                          idPart="requestedRemedy"
+                          name="requestedRemedy"
+                          option={
+                            Object {
+                              "disabled": true,
+                              "displayText": "Proceed with partial transcript",
+                              "value": "Proceed with partial transcript",
+                            }
+                          }
+                          value=""
+                        >
+                          <input
+                            checked={false}
+                            disabled={true}
+                            id="requestedRemedy_Proceed with partial transcript"
+                            name="requestedRemedy"
+                            onChange={[Function]}
+                            type="radio"
+                            value="Proceed with partial transcript"
+                          />
+                        </RadioInput>
+                        <label
+                          className="disabled"
+                          htmlFor="requestedRemedy_Proceed with partial transcript"
+                        >
+                          Proceed with partial transcript
+                        </label>
+                      </div>
+                    </MaybeAddTooltip>
+                    <MaybeAddTooltip
+                      key="New hearing"
+                      option={
+                        Object {
+                          "disabled": true,
+                          "displayText": "New hearing",
+                          "value": "New hearing",
+                        }
+                      }
                     >
-                      <input
-                        checked={false}
-                        disabled={true}
-                        id="requestedRemedy_New hearing"
-                        name="requestedRemedy"
-                        onChange={[Function]}
-                        type="radio"
-                        value="New hearing"
-                      />
-                      <label
-                        className="disabled"
-                        htmlFor="requestedRemedy_New hearing"
+                      <div
+                        className="cf-form-radio-option"
+                        key="requestedRemedy-New hearing-2"
                       >
-                        New hearing
-                      </label>
-                    </div>
-                    <div
-                      className="cf-form-radio-option"
-                      key="requestedRemedy--3"
+                        <RadioInput
+                          controlled={true}
+                          handleChange={[Function]}
+                          idPart="requestedRemedy"
+                          name="requestedRemedy"
+                          option={
+                            Object {
+                              "disabled": true,
+                              "displayText": "New hearing",
+                              "value": "New hearing",
+                            }
+                          }
+                          value=""
+                        >
+                          <input
+                            checked={false}
+                            disabled={true}
+                            id="requestedRemedy_New hearing"
+                            name="requestedRemedy"
+                            onChange={[Function]}
+                            type="radio"
+                            value="New hearing"
+                          />
+                        </RadioInput>
+                        <label
+                          className="disabled"
+                          htmlFor="requestedRemedy_New hearing"
+                        >
+                          New hearing
+                        </label>
+                      </div>
+                    </MaybeAddTooltip>
+                    <MaybeAddTooltip
+                      key=""
+                      option={
+                        Object {
+                          "disabled": true,
+                          "displayText": "None",
+                          "value": "",
+                        }
+                      }
                     >
-                      <input
-                        checked={true}
-                        disabled={true}
-                        id="requestedRemedy_"
-                        name="requestedRemedy"
-                        onChange={[Function]}
-                        type="radio"
-                        value=""
-                      />
-                      <label
-                        className="disabled"
-                        htmlFor="requestedRemedy_"
+                      <div
+                        className="cf-form-radio-option"
+                        key="requestedRemedy--3"
                       >
-                        None
-                      </label>
-                    </div>
+                        <RadioInput
+                          controlled={true}
+                          handleChange={[Function]}
+                          idPart="requestedRemedy"
+                          name="requestedRemedy"
+                          option={
+                            Object {
+                              "disabled": true,
+                              "displayText": "None",
+                              "value": "",
+                            }
+                          }
+                          value=""
+                        >
+                          <input
+                            checked={true}
+                            disabled={true}
+                            id="requestedRemedy_"
+                            name="requestedRemedy"
+                            onChange={[Function]}
+                            type="radio"
+                            value=""
+                          />
+                        </RadioInput>
+                        <label
+                          className="disabled"
+                          htmlFor="requestedRemedy_"
+                        >
+                          None
+                        </label>
+                      </div>
+                    </MaybeAddTooltip>
                   </div>
                 </fieldset>
               </RadioField>
diff --git a/client/test/app/hearings/components/modalForms/__snapshots__/HearingTime.test.js.snap b/client/test/app/hearings/components/modalForms/__snapshots__/HearingTime.test.js.snap
index d6eff75bfd6..73100683693 100644
--- a/client/test/app/hearings/components/modalForms/__snapshots__/HearingTime.test.js.snap
+++ b/client/test/app/hearings/components/modalForms/__snapshots__/HearingTime.test.js.snap
@@ -58,66 +58,144 @@ exports[`HearingTime Matches snapshot when enableZone is true 1`] = `
         <div
           className="cf-form-radio-options"
         >
-          <div
-            className="cf-form-radio-option"
-            key="hearingTime0-08:30-0"
+          <MaybeAddTooltip
+            key="08:30"
+            option={
+              Object {
+                "disabled": undefined,
+                "displayText": "8:30 AM Eastern Time (US & Canada)",
+                "value": "08:30",
+              }
+            }
           >
-            <input
-              checked={false}
-              disabled={false}
-              id="hearingTime0_08:30"
-              name="hearingTime0"
-              onChange={[Function]}
-              type="radio"
-              value="08:30"
-            />
-            <label
-              className=""
-              htmlFor="hearingTime0_08:30"
+            <div
+              className="cf-form-radio-option"
+              key="hearingTime0-08:30-0"
             >
-              8:30 AM Eastern Time (US & Canada)
-            </label>
-          </div>
-          <div
-            className="cf-form-radio-option"
-            key="hearingTime0-12:30-1"
+              <RadioInput
+                controlled={true}
+                handleChange={[Function]}
+                idPart="hearingTime0"
+                name="hearingTime0"
+                option={
+                  Object {
+                    "disabled": undefined,
+                    "displayText": "8:30 AM Eastern Time (US & Canada)",
+                    "value": "08:30",
+                  }
+                }
+                value="other"
+              >
+                <input
+                  checked={false}
+                  disabled={false}
+                  id="hearingTime0_08:30"
+                  name="hearingTime0"
+                  onChange={[Function]}
+                  type="radio"
+                  value="08:30"
+                />
+              </RadioInput>
+              <label
+                className=""
+                htmlFor="hearingTime0_08:30"
+              >
+                8:30 AM Eastern Time (US & Canada)
+              </label>
+            </div>
+          </MaybeAddTooltip>
+          <MaybeAddTooltip
+            key="12:30"
+            option={
+              Object {
+                "disabled": undefined,
+                "displayText": "12:30 PM Eastern Time (US & Canada)",
+                "value": "12:30",
+              }
+            }
           >
-            <input
-              checked={false}
-              disabled={false}
-              id="hearingTime0_12:30"
-              name="hearingTime0"
-              onChange={[Function]}
-              type="radio"
-              value="12:30"
-            />
-            <label
-              className=""
-              htmlFor="hearingTime0_12:30"
+            <div
+              className="cf-form-radio-option"
+              key="hearingTime0-12:30-1"
             >
-              12:30 PM Eastern Time (US & Canada)
-            </label>
-          </div>
-          <div
-            className="cf-form-radio-option"
-            key="hearingTime0-other-2"
+              <RadioInput
+                controlled={true}
+                handleChange={[Function]}
+                idPart="hearingTime0"
+                name="hearingTime0"
+                option={
+                  Object {
+                    "disabled": undefined,
+                    "displayText": "12:30 PM Eastern Time (US & Canada)",
+                    "value": "12:30",
+                  }
+                }
+                value="other"
+              >
+                <input
+                  checked={false}
+                  disabled={false}
+                  id="hearingTime0_12:30"
+                  name="hearingTime0"
+                  onChange={[Function]}
+                  type="radio"
+                  value="12:30"
+                />
+              </RadioInput>
+              <label
+                className=""
+                htmlFor="hearingTime0_12:30"
+              >
+                12:30 PM Eastern Time (US & Canada)
+              </label>
+            </div>
+          </MaybeAddTooltip>
+          <MaybeAddTooltip
+            key="other"
+            option={
+              Object {
+                "disabled": undefined,
+                "displayText": "Other",
+                "value": "other",
+              }
+            }
           >
-            <input
-              checked={true}
-              disabled={false}
-              id="hearingTime0_other"
-              name="hearingTime0"
-              onChange={[Function]}
-              type="radio"
-              value="other"
-            />
-            <label
-              className=""
-              htmlFor="hearingTime0_other"
+            <div
+              className="cf-form-radio-option"
+              key="hearingTime0-other-2"
             >
-              Other
-            </label>
-          </div>
+              <RadioInput
+                controlled={true}
+                handleChange={[Function]}
+                idPart="hearingTime0"
+                name="hearingTime0"
+                option={
+                  Object {
+                    "disabled": undefined,
+                    "displayText": "Other",
+                    "value": "other",
+                  }
+                }
+                value="other"
+              >
+                <input
+                  checked={true}
+                  disabled={false}
+                  id="hearingTime0_other"
+                  name="hearingTime0"
+                  onChange={[Function]}
+                  type="radio"
+                  value="other"
+                />
+              </RadioInput>
+              <label
+                className=""
+                htmlFor="hearingTime0_other"
+              >
+                Other
+              </label>
+            </div>
+          </MaybeAddTooltip>
         </div>
       </fieldset>
     </RadioField>
@@ -9008,66 +9086,144 @@ exports[`HearingTime Matches snapshot when other time is not selected 1`] = `
         <div
           className="cf-form-radio-options"
         >
-          <div
-            className="cf-form-radio-option"
-            key="hearingTime0-08:30-0"
+          <MaybeAddTooltip
+            key="08:30"
+            option={
+              Object {
+                "disabled": undefined,
+                "displayText": "8:30 am",
+                "value": "08:30",
+              }
+            }
           >
-            <input
-              checked={false}
-              disabled={false}
-              id="hearingTime0_08:30"
-              name="hearingTime0"
-              onChange={[Function]}
-              type="radio"
-              value="08:30"
-            />
-            <label
-              className=""
-              htmlFor="hearingTime0_08:30"
+            <div
+              className="cf-form-radio-option"
+              key="hearingTime0-08:30-0"
             >
-              8:30 am
-            </label>
-          </div>
-          <div
-            className="cf-form-radio-option"
-            key="hearingTime0-12:30-1"
+              <RadioInput
+                controlled={true}
+                handleChange={[Function]}
+                idPart="hearingTime0"
+                name="hearingTime0"
+                option={
+                  Object {
+                    "disabled": undefined,
+                    "displayText": "8:30 am",
+                    "value": "08:30",
+                  }
+                }
+                value="12:30"
+              >
+                <input
+                  checked={false}
+                  disabled={false}
+                  id="hearingTime0_08:30"
+                  name="hearingTime0"
+                  onChange={[Function]}
+                  type="radio"
+                  value="08:30"
+                />
+              </RadioInput>
+              <label
+                className=""
+                htmlFor="hearingTime0_08:30"
+              >
+                8:30 am
+              </label>
+            </div>
+          </MaybeAddTooltip>
+          <MaybeAddTooltip
+            key="12:30"
+            option={
+              Object {
+                "disabled": undefined,
+                "displayText": "12:30 pm",
+                "value": "12:30",
+              }
+            }
           >
-            <input
-              checked={true}
-              disabled={false}
-              id="hearingTime0_12:30"
-              name="hearingTime0"
-              onChange={[Function]}
-              type="radio"
-              value="12:30"
-            />
-            <label
-              className=""
-              htmlFor="hearingTime0_12:30"
+            <div
+              className="cf-form-radio-option"
+              key="hearingTime0-12:30-1"
             >
-              12:30 pm
-            </label>
-          </div>
-          <div
-            className="cf-form-radio-option"
-            key="hearingTime0-other-2"
+              <RadioInput
+                controlled={true}
+                handleChange={[Function]}
+                idPart="hearingTime0"
+                name="hearingTime0"
+                option={
+                  Object {
+                    "disabled": undefined,
+                    "displayText": "12:30 pm",
+                    "value": "12:30",
+                  }
+                }
+                value="12:30"
+              >
+                <input
+                  checked={true}
+                  disabled={false}
+                  id="hearingTime0_12:30"
+                  name="hearingTime0"
+                  onChange={[Function]}
+                  type="radio"
+                  value="12:30"
+                />
+              </RadioInput>
+              <label
+                className=""
+                htmlFor="hearingTime0_12:30"
+              >
+                12:30 pm
+              </label>
+            </div>
+          </MaybeAddTooltip>
+          <MaybeAddTooltip
+            key="other"
+            option={
+              Object {
+                "disabled": undefined,
+                "displayText": "Other",
+                "value": "other",
+              }
+            }
           >
-            <input
-              checked={false}
-              disabled={false}
-              id="hearingTime0_other"
-              name="hearingTime0"
-              onChange={[Function]}
-              type="radio"
-              value="other"
-            />
-            <label
-              className=""
-              htmlFor="hearingTime0_other"
+            <div
+              className="cf-form-radio-option"
+              key="hearingTime0-other-2"
             >
-              Other
-            </label>
-          </div>
+              <RadioInput
+                controlled={true}
+                handleChange={[Function]}
+                idPart="hearingTime0"
+                name="hearingTime0"
+                option={
+                  Object {
+                    "disabled": undefined,
+                    "displayText": "Other",
+                    "value": "other",
+                  }
+                }
+                value="12:30"
+              >
+                <input
+                  checked={false}
+                  disabled={false}
+                  id="hearingTime0_other"
+                  name="hearingTime0"
+                  onChange={[Function]}
+                  type="radio"
+                  value="other"
+                />
+              </RadioInput>
+              <label
+                className=""
+                htmlFor="hearingTime0_other"
+              >
+                Other
+              </label>
+            </div>
+          </MaybeAddTooltip>
         </div>
       </fieldset>
     </RadioField>
@@ -9133,66 +9289,144 @@ exports[`HearingTime Matches snapshot when other time is selected 1`] = `
         <div
           className="cf-form-radio-options"
         >
-          <div
-            className="cf-form-radio-option"
-            key="hearingTime0-08:30-0"
+          <MaybeAddTooltip
+            key="08:30"
+            option={
+              Object {
+                "disabled": undefined,
+                "displayText": "8:30 am",
+                "value": "08:30",
+              }
+            }
           >
-            <input
-              checked={false}
-              disabled={false}
-              id="hearingTime0_08:30"
-              name="hearingTime0"
-              onChange={[Function]}
-              type="radio"
-              value="08:30"
-            />
-            <label
-              className=""
-              htmlFor="hearingTime0_08:30"
+            <div
+              className="cf-form-radio-option"
+              key="hearingTime0-08:30-0"
             >
-              8:30 am
-            </label>
-          </div>
-          <div
-            className="cf-form-radio-option"
-            key="hearingTime0-12:30-1"
+              <RadioInput
+                controlled={true}
+                handleChange={[Function]}
+                idPart="hearingTime0"
+                name="hearingTime0"
+                option={
+                  Object {
+                    "disabled": undefined,
+                    "displayText": "8:30 am",
+                    "value": "08:30",
+                  }
+                }
+                value="other"
+              >
+                <input
+                  checked={false}
+                  disabled={false}
+                  id="hearingTime0_08:30"
+                  name="hearingTime0"
+                  onChange={[Function]}
+                  type="radio"
+                  value="08:30"
+                />
+              </RadioInput>
+              <label
+                className=""
+                htmlFor="hearingTime0_08:30"
+              >
+                8:30 am
+              </label>
+            </div>
+          </MaybeAddTooltip>
+          <MaybeAddTooltip
+            key="12:30"
+            option={
+              Object {
+                "disabled": undefined,
+                "displayText": "12:30 pm",
+                "value": "12:30",
+              }
+            }
           >
-            <input
-              checked={false}
-              disabled={false}
-              id="hearingTime0_12:30"
-              name="hearingTime0"
-              onChange={[Function]}
-              type="radio"
-              value="12:30"
-            />
-            <label
-              className=""
-              htmlFor="hearingTime0_12:30"
+            <div
+              className="cf-form-radio-option"
+              key="hearingTime0-12:30-1"
             >
-              12:30 pm
-            </label>
-          </div>
-          <div
-            className="cf-form-radio-option"
-            key="hearingTime0-other-2"
+              <RadioInput
+                controlled={true}
+                handleChange={[Function]}
+                idPart="hearingTime0"
+                name="hearingTime0"
+                option={
+                  Object {
+                    "disabled": undefined,
+                    "displayText": "12:30 pm",
+                    "value": "12:30",
+                  }
+                }
+                value="other"
+              >
+                <input
+                  checked={false}
+                  disabled={false}
+                  id="hearingTime0_12:30"
+                  name="hearingTime0"
+                  onChange={[Function]}
+                  type="radio"
+                  value="12:30"
+                />
+              </RadioInput>
+              <label
+                className=""
+                htmlFor="hearingTime0_12:30"
+              >
+                12:30 pm
+              </label>
+            </div>
+          </MaybeAddTooltip>
+          <MaybeAddTooltip
+            key="other"
+            option={
+              Object {
+                "disabled": undefined,
+                "displayText": "Other",
+                "value": "other",
+              }
+            }
           >
-            <input
-              checked={true}
-              disabled={false}
-              id="hearingTime0_other"
-              name="hearingTime0"
-              onChange={[Function]}
-              type="radio"
-              value="other"
-            />
-            <label
-              className=""
-              htmlFor="hearingTime0_other"
+            <div
+              className="cf-form-radio-option"
+              key="hearingTime0-other-2"
             >
-              Other
-            </label>
-          </div>
+              <RadioInput
+                controlled={true}
+                handleChange={[Function]}
+                idPart="hearingTime0"
+                name="hearingTime0"
+                option={
+                  Object {
+                    "disabled": undefined,
+                    "displayText": "Other",
+                    "value": "other",
+                  }
+                }
+                value="other"
+              >
+                <input
+                  checked={true}
+                  disabled={false}
+                  id="hearingTime0_other"
+                  name="hearingTime0"
+                  onChange={[Function]}
+                  type="radio"
+                  value="other"
+                />
+              </RadioInput>
+              <label
+                className=""
+                htmlFor="hearingTime0_other"
+              >
+                Other
+              </label>
+            </div>
+          </MaybeAddTooltip>
         </div>
       </fieldset>
     </RadioField>
@@ -18082,66 +18316,144 @@ exports[`HearingTime Matches snapshot when readonly prop is set 1`] = `
         <div
           className="cf-form-radio-options"
         >
-          <div
-            className="cf-form-radio-option"
-            key="hearingTime0-08:30-0"
+          <MaybeAddTooltip
+            key="08:30"
+            option={
+              Object {
+                "disabled": undefined,
+                "displayText": "8:30 am",
+                "value": "08:30",
+              }
+            }
           >
-            <input
-              checked={false}
-              disabled={false}
-              id="hearingTime0_08:30"
-              name="hearingTime0"
-              onChange={[Function]}
-              type="radio"
-              value="08:30"
-            />
-            <label
-              className=""
-              htmlFor="hearingTime0_08:30"
+            <div
+              className="cf-form-radio-option"
+              key="hearingTime0-08:30-0"
             >
-              8:30 am
-            </label>
-          </div>
-          <div
-            className="cf-form-radio-option"
-            key="hearingTime0-12:30-1"
+              <RadioInput
+                controlled={true}
+                handleChange={[Function]}
+                idPart="hearingTime0"
+                name="hearingTime0"
+                option={
+                  Object {
+                    "disabled": undefined,
+                    "displayText": "8:30 am",
+                    "value": "08:30",
+                  }
+                }
+                value="other"
+              >
+                <input
+                  checked={false}
+                  disabled={false}
+                  id="hearingTime0_08:30"
+                  name="hearingTime0"
+                  onChange={[Function]}
+                  type="radio"
+                  value="08:30"
+                />
+              </RadioInput>
+              <label
+                className=""
+                htmlFor="hearingTime0_08:30"
+              >
+                8:30 am
+              </label>
+            </div>
+          </MaybeAddTooltip>
+          <MaybeAddTooltip
+            key="12:30"
+            option={
+              Object {
+                "disabled": undefined,
+                "displayText": "12:30 pm",
+                "value": "12:30",
+              }
+            }
           >
-            <input
-              checked={false}
-              disabled={false}
-              id="hearingTime0_12:30"
-              name="hearingTime0"
-              onChange={[Function]}
-              type="radio"
-              value="12:30"
-            />
-            <label
-              className=""
-              htmlFor="hearingTime0_12:30"
+            <div
+              className="cf-form-radio-option"
+              key="hearingTime0-12:30-1"
             >
-              12:30 pm
-            </label>
-          </div>
-          <div
-            className="cf-form-radio-option"
-            key="hearingTime0-other-2"
+              <RadioInput
+                controlled={true}
+                handleChange={[Function]}
+                idPart="hearingTime0"
+                name="hearingTime0"
+                option={
+                  Object {
+                    "disabled": undefined,
+                    "displayText": "12:30 pm",
+                    "value": "12:30",
+                  }
+                }
+                value="other"
+              >
+                <input
+                  checked={false}
+                  disabled={false}
+                  id="hearingTime0_12:30"
+                  name="hearingTime0"
+                  onChange={[Function]}
+                  type="radio"
+                  value="12:30"
+                />
+              </RadioInput>
+              <label
+                className=""
+                htmlFor="hearingTime0_12:30"
+              >
+                12:30 pm
+              </label>
+            </div>
+          </MaybeAddTooltip>
+          <MaybeAddTooltip
+            key="other"
+            option={
+              Object {
+                "disabled": undefined,
+                "displayText": "Other",
+                "value": "other",
+              }
+            }
           >
-            <input
-              checked={true}
-              disabled={false}
-              id="hearingTime0_other"
-              name="hearingTime0"
-              onChange={[Function]}
-              type="radio"
-              value="other"
-            />
-            <label
-              className=""
-              htmlFor="hearingTime0_other"
+            <div
+              className="cf-form-radio-option"
+              key="hearingTime0-other-2"
             >
-              Other
-            </label>
-          </div>
+              <RadioInput
+                controlled={true}
+                handleChange={[Function]}
+                idPart="hearingTime0"
+                name="hearingTime0"
+                option={
+                  Object {
+                    "disabled": undefined,
+                    "displayText": "Other",
+                    "value": "other",
+                  }
+                }
+                value="other"
+              >
+                <input
+                  checked={true}
+                  disabled={false}
+                  id="hearingTime0_other"
+                  name="hearingTime0"
+                  onChange={[Function]}
+                  type="radio"
+                  value="other"
+                />
+              </RadioInput>
+              <label
+                className=""
+                htmlFor="hearingTime0_other"
+              >
+                Other
+              </label>
+            </div>
+          </MaybeAddTooltip>
         </div>
       </fieldset>
     </RadioField>
@@ -26984,66 +27296,144 @@ exports[`HearingTime Matches snapshot with default props when passed in 1`] = `
         <div
           className="cf-form-radio-options"
         >
-          <div
-            className="cf-form-radio-option"
-            key="hearingTime0-08:30-0"
+          <MaybeAddTooltip
+            key="08:30"
+            option={
+              Object {
+                "disabled": undefined,
+                "displayText": "8:30 am",
+                "value": "08:30",
+              }
+            }
           >
-            <input
-              checked={false}
-              disabled={false}
-              id="hearingTime0_08:30"
-              name="hearingTime0"
-              onChange={[Function]}
-              type="radio"
-              value="08:30"
-            />
-            <label
-              className=""
-              htmlFor="hearingTime0_08:30"
+            <div
+              className="cf-form-radio-option"
+              key="hearingTime0-08:30-0"
             >
-              8:30 am
-            </label>
-          </div>
-          <div
-            className="cf-form-radio-option"
-            key="hearingTime0-12:30-1"
+              <RadioInput
+                controlled={true}
+                handleChange={[Function]}
+                idPart="hearingTime0"
+                name="hearingTime0"
+                option={
+                  Object {
+                    "disabled": undefined,
+                    "displayText": "8:30 am",
+                    "value": "08:30",
+                  }
+                }
+                value="other"
+              >
+                <input
+                  checked={false}
+                  disabled={false}
+                  id="hearingTime0_08:30"
+                  name="hearingTime0"
+                  onChange={[Function]}
+                  type="radio"
+                  value="08:30"
+                />
+              </RadioInput>
+              <label
+                className=""
+                htmlFor="hearingTime0_08:30"
+              >
+                8:30 am
+              </label>
+            </div>
+          </MaybeAddTooltip>
+          <MaybeAddTooltip
+            key="12:30"
+            option={
+              Object {
+                "disabled": undefined,
+                "displayText": "12:30 pm",
+                "value": "12:30",
+              }
+            }
           >
-            <input
-              checked={false}
-              disabled={false}
-              id="hearingTime0_12:30"
-              name="hearingTime0"
-              onChange={[Function]}
-              type="radio"
-              value="12:30"
-            />
-            <label
-              className=""
-              htmlFor="hearingTime0_12:30"
+            <div
+              className="cf-form-radio-option"
+              key="hearingTime0-12:30-1"
             >
-              12:30 pm
-            </label>
-          </div>
-          <div
-            className="cf-form-radio-option"
-            key="hearingTime0-other-2"
+              <RadioInput
+                controlled={true}
+                handleChange={[Function]}
+                idPart="hearingTime0"
+                name="hearingTime0"
+                option={
+                  Object {
+                    "disabled": undefined,
+                    "displayText": "12:30 pm",
+                    "value": "12:30",
+                  }
+                }
+                value="other"
+              >
+                <input
+                  checked={false}
+                  disabled={false}
+                  id="hearingTime0_12:30"
+                  name="hearingTime0"
+                  onChange={[Function]}
+                  type="radio"
+                  value="12:30"
+                />
+              </RadioInput>
+              <label
+                className=""
+                htmlFor="hearingTime0_12:30"
+              >
+                12:30 pm
+              </label>
+            </div>
+          </MaybeAddTooltip>
+          <MaybeAddTooltip
+            key="other"
+            option={
+              Object {
+                "disabled": undefined,
+                "displayText": "Other",
+                "value": "other",
+              }
+            }
           >
-            <input
-              checked={true}
-              disabled={false}
-              id="hearingTime0_other"
-              name="hearingTime0"
-              onChange={[Function]}
-              type="radio"
-              value="other"
-            />
-            <label
-              className=""
-              htmlFor="hearingTime0_other"
+            <div
+              className="cf-form-radio-option"
+              key="hearingTime0-other-2"
             >
-              Other
-            </label>
-          </div>
+              <RadioInput
+                controlled={true}
+                handleChange={[Function]}
+                idPart="hearingTime0"
+                name="hearingTime0"
+                option={
+                  Object {
+                    "disabled": undefined,
+                    "displayText": "Other",
+                    "value": "other",
+                  }
+                }
+                value="other"
+              >
+                <input
+                  checked={true}
+                  disabled={false}
+                  id="hearingTime0_other"
+                  name="hearingTime0"
+                  onChange={[Function]}
+                  type="radio"
+                  value="other"
+                />
+              </RadioInput>
+              <label
+                className=""
+                htmlFor="hearingTime0_other"
+              >
+                Other
+              </label>
+            </div>
+          </MaybeAddTooltip>
         </div>
       </fieldset>
     </RadioField>
diff --git a/client/test/app/queue/cavc/__snapshots__/AddCavcRemandView.test.js.snap b/client/test/app/queue/cavc/__snapshots__/AddCavcRemandView.test.js.snap
index 57f1ad07fd8..761d75aea32 100644
--- a/client/test/app/queue/cavc/__snapshots__/AddCavcRemandView.test.js.snap
+++ b/client/test/app/queue/cavc/__snapshots__/AddCavcRemandView.test.js.snap
@@ -377,46 +377,94 @@ exports[`AddCavcRemandView renders correctly 1`] = `
                     <div
                       className="cf-form-radio-options"
                     >
-                      <div
-                        className="cf-form-radio-option"
-                        key="attorney-options-1-0"
+                      <MaybeAddTooltip
+                        key="1"
+                        option={
+                          Object {
+                            "displayText": "Yes",
+                            "value": "1",
+                          }
+                        }
                       >
-                        <input
-                          checked={true}
-                          disabled={false}
-                          id="attorney-options_1"
-                          name="attorney-options"
-                          onChange={[Function]}
-                          type="radio"
-                          value="1"
-                        />
-                        <label
-                          className=""
-                          htmlFor="attorney-options_1"
+                        <div
+                          className="cf-form-radio-option"
+                          key="attorney-options-1-0"
                         >
-                          Yes
-                        </label>
-                      </div>
-                      <div
-                        className="cf-form-radio-option"
-                        key="attorney-options-2-1"
+                          <RadioInput
+                            controlled={true}
+                            handleChange={[Function]}
+                            idPart="attorney-options"
+                            name="attorney-options"
+                            option={
+                              Object {
+                                "displayText": "Yes",
+                                "value": "1",
+                              }
+                            }
+                            value="1"
+                          >
+                            <input
+                              checked={true}
+                              disabled={false}
+                              id="attorney-options_1"
+                              name="attorney-options"
+                              onChange={[Function]}
+                              type="radio"
+                              value="1"
+                            />
+                          </RadioInput>
+                          <label
+                            className=""
+                            htmlFor="attorney-options_1"
+                          >
+                            Yes
+                          </label>
+                        </div>
+                      </MaybeAddTooltip>
+                      <MaybeAddTooltip
+                        key="2"
+                        option={
+                          Object {
+                            "displayText": "No",
+                            "value": "2",
+                          }
+                        }
                       >
-                        <input
-                          checked={false}
-                          disabled={false}
-                          id="attorney-options_2"
-                          name="attorney-options"
-                          onChange={[Function]}
-                          type="radio"
-                          value="2"
-                        />
-                        <label
-                          className=""
-                          htmlFor="attorney-options_2"
+                        <div
+                          className="cf-form-radio-option"
+                          key="attorney-options-2-1"
                         >
-                          No
-                        </label>
-                      </div>
+                          <RadioInput
+                            controlled={true}
+                            handleChange={[Function]}
+                            idPart="attorney-options"
+                            name="attorney-options"
+                            option={
+                              Object {
+                                "displayText": "No",
+                                "value": "2",
+                              }
+                            }
+                            value="1"
+                          >
+                            <input
+                              checked={false}
+                              disabled={false}
+                              id="attorney-options_2"
+                              name="attorney-options"
+                              onChange={[Function]}
+                              type="radio"
+                              value="2"
+                            />
+                          </RadioInput>
+                          <label
+                            className=""
+                            htmlFor="attorney-options_2"
+                          >
+                            No
+                          </label>
+                        </div>
+                      </MaybeAddTooltip>
                     </div>
                   </fieldset>
                 </RadioField>
@@ -3633,86 +3681,182 @@ exports[`AddCavcRemandView renders correctly 1`] = `
                     <div
                       className="cf-form-radio-options"
                     >
-                      <div
-                        className="cf-form-radio-option"
-                        key="type-options-remand-0"
+                      <MaybeAddTooltip
+                        key="remand"
+                        option={
+                          Object {
+                            "displayText": "Remand",
+                            "value": "remand",
+                          }
+                        }
                       >
-                        <input
-                          checked={true}
-                          disabled={false}
-                          id="type-options_remand"
-                          name="type-options"
-                          onChange={[Function]}
-                          type="radio"
-                          value="remand"
-                        />
-                        <label
-                          className=""
-                          htmlFor="type-options_remand"
+                        <div
+                          className="cf-form-radio-option"
+                          key="type-options-remand-0"
                         >
-                          Remand
-                        </label>
-                      </div>
-                      <div
-                        className="cf-form-radio-option"
-                        key="type-options-other_dismissal-1"
+                          <RadioInput
+                            controlled={true}
+                            handleChange={[Function]}
+                            idPart="type-options"
+                            name="type-options"
+                            option={
+                              Object {
+                                "displayText": "Remand",
+                                "value": "remand",
+                              }
+                            }
+                            value="remand"
+                          >
+                            <input
+                              checked={true}
+                              disabled={false}
+                              id="type-options_remand"
+                              name="type-options"
+                              onChange={[Function]}
+                              type="radio"
+                              value="remand"
+                            />
+                          </RadioInput>
+                          <label
+                            className=""
+                            htmlFor="type-options_remand"
+                          >
+                            Remand
+                          </label>
+                        </div>
+                      </MaybeAddTooltip>
+                      <MaybeAddTooltip
+                        key="other_dismissal"
+                        option={
+                          Object {
+                            "displayText": "Dismissal, other than Death",
+                            "value": "other_dismissal",
+                          }
+                        }
                       >
-                        <input
-                          checked={false}
-                          disabled={false}
-                          id="type-options_other_dismissal"
-                          name="type-options"
-                          onChange={[Function]}
-                          type="radio"
-                          value="other_dismissal"
-                        />
-                        <label
-                          className=""
-                          htmlFor="type-options_other_dismissal"
+                        <div
+                          className="cf-form-radio-option"
+                          key="type-options-other_dismissal-1"
                         >
-                          Dismissal, other than Death
-                        </label>
-                      </div>
-                      <div
-                        className="cf-form-radio-option"
-                        key="type-options-affirmed-2"
+                          <RadioInput
+                            controlled={true}
+                            handleChange={[Function]}
+                            idPart="type-options"
+                            name="type-options"
+                            option={
+                              Object {
+                                "displayText": "Dismissal, other than Death",
+                                "value": "other_dismissal",
+                              }
+                            }
+                            value="remand"
+                          >
+                            <input
+                              checked={false}
+                              disabled={false}
+                              id="type-options_other_dismissal"
+                              name="type-options"
+                              onChange={[Function]}
+                              type="radio"
+                              value="other_dismissal"
+                            />
+                          </RadioInput>
+                          <label
+                            className=""
+                            htmlFor="type-options_other_dismissal"
+                          >
+                            Dismissal, other than Death
+                          </label>
+                        </div>
+                      </MaybeAddTooltip>
+                      <MaybeAddTooltip
+                        key="affirmed"
+                        option={
+                          Object {
+                            "displayText": "Affirmed",
+                            "value": "affirmed",
+                          }
+                        }
                       >
-                        <input
-                          checked={false}
-                          disabled={false}
-                          id="type-options_affirmed"
-                          name="type-options"
-                          onChange={[Function]}
-                          type="radio"
-                          value="affirmed"
-                        />
-                        <label
-                          className=""
-                          htmlFor="type-options_affirmed"
+                        <div
+                          className="cf-form-radio-option"
+                          key="type-options-affirmed-2"
                         >
-                          Affirmed
-                        </label>
-                      </div>
-                      <div
-                        className="cf-form-radio-option"
-                        key="type-options-settlement-3"
+                          <RadioInput
+                            controlled={true}
+                            handleChange={[Function]}
+                            idPart="type-options"
+                            name="type-options"
+                            option={
+                              Object {
+                                "displayText": "Affirmed",
+                                "value": "affirmed",
+                              }
+                            }
+                            value="remand"
+                          >
+                            <input
+                              checked={false}
+                              disabled={false}
+                              id="type-options_affirmed"
+                              name="type-options"
+                              onChange={[Function]}
+                              type="radio"
+                              value="affirmed"
+                            />
+                          </RadioInput>
+                          <label
+                            className=""
+                            htmlFor="type-options_affirmed"
+                          >
+                            Affirmed
+                          </label>
+                        </div>
+                      </MaybeAddTooltip>
+                      <MaybeAddTooltip
+                        key="settlement"
+                        option={
+                          Object {
+                            "displayText": "Settlement",
+                            "value": "settlement",
+                          }
+                        }
                       >
-                        <input
-                          checked={false}
-                          disabled={false}
-                          id="type-options_settlement"
-                          name="type-options"
-                          onChange={[Function]}
-                          type="radio"
-                          value="settlement"
-                        />
-                        <label
-                          className=""
-                          htmlFor="type-options_settlement"
+                        <div
+                          className="cf-form-radio-option"
+                          key="type-options-settlement-3"
                         >
-                          Settlement
-                        </label>
-                      </div>
+                          <RadioInput
+                            controlled={true}
+                            handleChange={[Function]}
+                            idPart="type-options"
+                            name="type-options"
+                            option={
+                              Object {
+                                "displayText": "Settlement",
+                                "value": "settlement",
+                              }
+                            }
+                            value="remand"
+                          >
+                            <input
+                              checked={false}
+                              disabled={false}
+                              id="type-options_settlement"
+                              name="type-options"
+                              onChange={[Function]}
+                              type="radio"
+                              value="settlement"
+                            />
+                          </RadioInput>
+                          <label
+                            className=""
+                            htmlFor="type-options_settlement"
+                          >
+                            Settlement
+                          </label>
+                        </div>
+                      </MaybeAddTooltip>
                     </div>
                   </fieldset>
                 </RadioField>
@@ -3760,26 +3904,50 @@ exports[`AddCavcRemandView renders correctly 1`] = `
                     <div
                       className="cf-form-radio-options"
                     >
-                      <div
-                        className="cf-form-radio-option"
-                        key="sub-type-options-jmr_jmpr-0"
+                      <MaybeAddTooltip
+                        key="jmr_jmpr"
+                        option={
+                          Object {
+                            "displayText": "Joint Motion for Remand (JMR) / Joint Motion for Partial Remand (JMPR)",
+                            "value": "jmr_jmpr",
+                          }
+                        }
                       >
-                        <input
-                          checked={true}
-                          disabled={false}
-                          id="sub-type-options_jmr_jmpr"
-                          name="sub-type-options"
-                          onChange={[Function]}
-                          type="radio"
-                          value="jmr_jmpr"
-                        />
-                        <label
-                          className=""
-                          htmlFor="sub-type-options_jmr_jmpr"
+                        <div
+                          className="cf-form-radio-option"
+                          key="sub-type-options-jmr_jmpr-0"
                         >
-                          Joint Motion for Remand (JMR) / Joint Motion for Partial Remand (JMPR)
-                        </label>
-                      </div>
+                          <RadioInput
+                            controlled={true}
+                            handleChange={[Function]}
+                            idPart="sub-type-options"
+                            name="sub-type-options"
+                            option={
+                              Object {
+                                "displayText": "Joint Motion for Remand (JMR) / Joint Motion for Partial Remand (JMPR)",
+                                "value": "jmr_jmpr",
+                              }
+                            }
+                            value="jmr_jmpr"
+                          >
+                            <input
+                              checked={true}
+                              disabled={false}
+                              id="sub-type-options_jmr_jmpr"
+                              name="sub-type-options"
+                              onChange={[Function]}
+                              type="radio"
+                              value="jmr_jmpr"
+                            />
+                          </RadioInput>
+                          <label
+                            className=""
+                            htmlFor="sub-type-options_jmr_jmpr"
+                          >
+                            Joint Motion for Remand (JMR) / Joint Motion for Partial Remand (JMPR)
+                          </label>
+                        </div>
+                      </MaybeAddTooltip>
                     </div>
                   </fieldset>
                 </RadioField>
diff --git a/client/test/app/queue/components/__snapshots__/CavcReviewExtensionRequestModal.test.js.snap b/client/test/app/queue/components/__snapshots__/CavcReviewExtensionRequestModal.test.js.snap
index 3a6e32b5403..3626bc5daaf 100644
--- a/client/test/app/queue/components/__snapshots__/CavcReviewExtensionRequestModal.test.js.snap
+++ b/client/test/app/queue/components/__snapshots__/CavcReviewExtensionRequestModal.test.js.snap
@@ -157,62 +157,112 @@ exports[`CavcReviewExtensionRequestModal renders correctly 1`] = `
                 <div
                   className="cf-form-radio-options"
                 >
-                  <div
-                    className="cf-form-radio-option"
-                    key="decision-grant-0"
+                  <MaybeAddTooltip
+                    key="grant"
+                    option={
+                      Object {
+                        "displayText": "Grant",
+                        "help": "Task will go on hold for selected number of days",
+                        "value": "grant",
+                      }
+                    }
                   >
-                    <input
-                      disabled={false}
-                      id="decision_grant"
-                      name="decision"
-                      onChange={[Function]}
-                      type="radio"
-                      value="grant"
-                    />
-                    <label
-                      className=""
-                      htmlFor="decision_grant"
+                    <div
+                      className="cf-form-radio-option"
+                      key="decision-grant-0"
                     >
-                      Grant
-                    </label>
-                    <RadioFieldHelpText
-                      help="Task will go on hold for selected number of days"
-                    >
-                      <div
-                        className="cf-form-radio-help helpText"
+                      <RadioInput
+                        controlled={false}
+                        handleChange={[Function]}
+                        idPart="decision"
+                        name="decision"
+                        option={
+                          Object {
+                            "displayText": "Grant",
+                            "help": "Task will go on hold for selected number of days",
+                            "value": "grant",
+                          }
+                        }
+                      >
+                        <input
+                          disabled={false}
+                          id="decision_grant"
+                          name="decision"
+                          onChange={[Function]}
+                          type="radio"
+                          value="grant"
+                        />
+                      </RadioInput>
+                      <label
+                        className=""
+                        htmlFor="decision_grant"
+                      >
+                        Grant
+                      </label>
+                      <RadioFieldHelpText
+                        help="Task will go on hold for selected number of days"
                       >
-                        Task will go on hold for selected number of days
-                      </div>
-                    </RadioFieldHelpText>
-                  </div>
-                  <div
-                    className="cf-form-radio-option"
-                    key="decision-deny-1"
+                        <div
+                          className="cf-form-radio-help helpText"
+                        >
+                          Task will go on hold for selected number of days
+                        </div>
+                      </RadioFieldHelpText>
+                    </div>
+                  </MaybeAddTooltip>
+                  <MaybeAddTooltip
+                    key="deny"
+                    option={
+                      Object {
+                        "displayText": "Deny",
+                        "help": "Marks the extension request as denied",
+                        "value": "deny",
+                      }
+                    }
                   >
-                    <input
-                      disabled={false}
-                      id="decision_deny"
-                      name="decision"
-                      onChange={[Function]}
-                      type="radio"
-                      value="deny"
-                    />
-                    <label
-                      className=""
-                      htmlFor="decision_deny"
+                    <div
+                      className="cf-form-radio-option"
+                      key="decision-deny-1"
                     >
-                      Deny
-                    </label>
-                    <RadioFieldHelpText
-                      help="Marks the extension request as denied"
-                    >
-                      <div
-                        className="cf-form-radio-help helpText"
+                      <RadioInput
+                        controlled={false}
+                        handleChange={[Function]}
+                        idPart="decision"
+                        name="decision"
+                        option={
+                          Object {
+                            "displayText": "Deny",
+                            "help": "Marks the extension request as denied",
+                            "value": "deny",
+                          }
+                        }
+                      >
+                        <input
+                          disabled={false}
+                          id="decision_deny"
+                          name="decision"
+                          onChange={[Function]}
+                          type="radio"
+                          value="deny"
+                        />
+                      </RadioInput>
+                      <label
+                        className=""
+                        htmlFor="decision_deny"
+                      >
+                        Deny
+                      </label>
+                      <RadioFieldHelpText
+                        help="Marks the extension request as denied"
                       >
-                        Marks the extension request as denied
-                      </div>
-                    </RadioFieldHelpText>
-                  </div>
+                        <div
+                          className="cf-form-radio-help helpText"
+                        >
+                          Marks the extension request as denied
+                        </div>
+                      </RadioFieldHelpText>
+                    </div>
+                  </MaybeAddTooltip>
                 </div>
               </fieldset>
             </RadioField>
diff --git a/config/brakeman.ignore b/config/brakeman.ignore
index 148c53721d1..8da9f451982 100644
--- a/config/brakeman.ignore
+++ b/config/brakeman.ignore
@@ -18,9 +18,26 @@
       },
       "user_input": "SchedulePeriod.find(params[:schedule_period_id]).spreadsheet_location",
       "confidence": "Medium",
-      "cwe_id": [
-        22
-      ],
+      "note": ""
+    },
+    {
+      "warning_type": "File Access",
+      "warning_code": 16,
+      "fingerprint": "3c37feede17bd60a0b4b4701d902b864de1120cbaa12e3421704244c3b0ff827",
+      "check_name": "SendFile",
+      "message": "Model attribute used in file name",
+      "file": "app/controllers/correspondence_review_package_controller.rb",
+      "line": 57,
+      "link": "https://brakemanscanner.org/docs/warning_types/file_access/",
+      "code": "send_file(Document.limit(200)[pdf_params[:pdf_id].to_i].serve, :type => \"application/pdf\", :disposition => ((\"inline\" or \"attachment; filename='#{pdf_params[:type]}-#{pdf_params[:id]}.pdf'\")))",
+      "render_path": null,
+      "location": {
+        "type": "method",
+        "class": "CorrespondenceReviewPackageController",
+        "method": "pdf"
+      },
+      "user_input": "Document.limit(200)[pdf_params[:pdf_id].to_i].serve",
+      "confidence": "Medium",
       "note": ""
     },
     {
@@ -41,9 +58,6 @@
       },
       "user_input": "Document.find(params[:id]).serve",
       "confidence": "Medium",
-      "cwe_id": [
-        22
-      ],
       "note": ""
     },
     {
@@ -76,7 +90,7 @@
       "check_name": "SQL",
       "message": "Possible SQL injection",
       "file": "app/jobs/ama_notification_efolder_sync_job.rb",
-      "line": 112,
+      "line": 113,
       "link": "https://brakemanscanner.org/docs/warning_types/sql_injection/",
       "code": "Appeal.find_by_sql(\"          SELECT appeals.* FROM appeals\\n          JOIN tasks t ON appeals.id = t.appeal_id\\n          AND t.appeal_type = 'Appeal'\\n          JOIN (#{appeals_on_latest_notifications(ids)}) AS notifs ON\\n            notifs.appeals_id = appeals.\\\"uuid\\\"::text AND notifs.appeals_type = 'Appeal'\\n          JOIN (#{appeals_on_latest_doc_uploads(ids)}) AS vbms_uploads ON\\n            vbms_uploads.appeal_id = appeals.id AND vbms_uploads.appeal_type = 'Appeal'\\n          WHERE (\\n            notifs.notified_at > vbms_uploads.attempted_at\\n          OR\\n            notifs.created_at > vbms_uploads.attempted_at\\n          )\\n          AND t.TYPE = 'RootTask' AND t.status NOT IN ('completed', 'cancelled')\\n          GROUP BY appeals.id\\n\")",
       "render_path": null,
@@ -87,9 +101,6 @@
       },
       "user_input": "appeals_on_latest_notifications(ids)",
       "confidence": "Medium",
-      "cwe_id": [
-        89
-      ],
       "note": ""
     },
     {
@@ -99,7 +110,7 @@
       "check_name": "SQL",
       "message": "Possible SQL injection",
       "file": "app/jobs/legacy_notification_efolder_sync_job.rb",
-      "line": 113,
+      "line": 114,
       "link": "https://brakemanscanner.org/docs/warning_types/sql_injection/",
       "code": "LegacyAppeal.find_by_sql(\"              SELECT la.* FROM legacy_appeals la\\n              JOIN tasks t ON la.id = t.appeal_id\\n              AND t.appeal_type = 'LegacyAppeal'\\n              JOIN (#{appeals_on_latest_notifications(ids)}) AS notifs ON\\n                notifs.appeals_id = la.vacols_id AND notifs.appeals_type = 'LegacyAppeal'\\n              JOIN (#{appeals_on_latest_doc_uploads(ids)}) AS vbms_uploads ON\\n                vbms_uploads.appeal_id = la.id AND vbms_uploads.appeal_type = 'LegacyAppeal'\\n              WHERE (\\n                notifs.notified_at > vbms_uploads.attempted_at\\n              OR\\n                notifs.created_at > vbms_uploads.attempted_at\\n              )\\n              AND t.type = 'RootTask' AND t.status NOT IN ('completed', 'cancelled')\\n              GROUP BY la.id\\n\")",
       "render_path": null,
@@ -110,9 +121,6 @@
       },
       "user_input": "appeals_on_latest_notifications(ids)",
       "confidence": "Medium",
-      "cwe_id": [
-        89
-      ],
       "note": ""
     },
     {
@@ -122,7 +130,7 @@
       "check_name": "SQL",
       "message": "Possible SQL injection",
       "file": "app/models/task.rb",
-      "line": 284,
+      "line": 283,
       "link": "https://brakemanscanner.org/docs/warning_types/sql_injection/",
       "code": "Arel.sql(\"CASE WHEN #{CachedAppeal.table_name}.is_aod = TRUE THEN #{(\"0 ELSE 1\" or \"1 ELSE 0\")} END, CASE WHEN #{CachedAppeal.table_name}.case_type = 'Court Remand' THEN #{(\"0 ELSE 1\" or \"1 ELSE 0\")} END, #{CachedAppeal.table_name}.docket_number #{order}, #{Task.table_name}.created_at #{order}\")",
       "render_path": null,
@@ -133,9 +141,6 @@
       },
       "user_input": "order",
       "confidence": "Medium",
-      "cwe_id": [
-        89
-      ],
       "note": ""
     },
     {
@@ -156,12 +161,9 @@
       },
       "user_input": "Document.find(document_id).serve",
       "confidence": "Medium",
-      "cwe_id": [
-        22
-      ],
       "note": ""
     }
   ],
-  "updated": "2024-06-27 14:50:46 -0400",
-  "brakeman_version": "5.4.1"
+  "updated": "2024-08-08 13:35:28 -0700",
+  "brakeman_version": "4.10.1"
 }