diff --git a/src/Helper/Fields/Field_Checkbox.php b/src/Helper/Fields/Field_Checkbox.php
index e945bf6cb..fbb151cb5 100644
--- a/src/Helper/Fields/Field_Checkbox.php
+++ b/src/Helper/Fields/Field_Checkbox.php
@@ -104,17 +104,17 @@ public function form_data() {
 	 */
 	public function html( $value = '', $label = true ) {
 
-		$items = $this->value();
-		$value = apply_filters( 'gfpdf_show_field_value', false, $this->field, $items ); /* Set to `true` to show a field's value instead of the label */
-		$html  = '';
+		$items      = $this->value();
+		$show_value = apply_filters( 'gfpdf_show_field_value', false, $this->field, $items ); /* Set to `true` to show a field's value instead of the label */
+		$html       = '';
 
-		/* Generate our drop down list */
+		/* Generate our dropdown list */
 		if ( count( $items ) > 0 ) {
 			$html = '<ul class="bulleted checkbox">';
 			$i    = 1;
 			foreach ( $items as $item ) {
-				$sanitized_option = ( $value ) ? $item['value'] : $item['label'];
-				$html            .= '<li id="field-' . $this->field->id . '-option-' . $i . '">' . $sanitized_option . '</li>';
+				$sanitized_option = $show_value ? $item['value'] : $item['label'];
+				$html            .= '<li id="' . esc_attr( 'field-' . $this->field->id . '-option-' . $i ) . '">' . $sanitized_option . '</li>';
 				$i++;
 			}
 
diff --git a/src/Helper/Fields/Field_Image_Choice.php b/src/Helper/Fields/Field_Image_Choice.php
new file mode 100644
index 000000000..61f1be8f1
--- /dev/null
+++ b/src/Helper/Fields/Field_Image_Choice.php
@@ -0,0 +1,102 @@
+<?php
+
+namespace GFPDF\Helper\Fields;
+
+/**
+ * @package     Gravity PDF
+ * @copyright   Copyright (c) 2024, Blue Liquid Designs
+ * @license     http://opensource.org/licenses/gpl-2.0.php GNU Public License
+ */
+
+/* Exit if accessed directly */
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * Controls the display and output of a Gravity Form field
+ *
+ * @since 6.12
+ *
+ * @property \GF_Field_Image_Choice $field
+ */
+class Field_Image_Choice extends Field_Multi_Choice {
+
+	/**
+	 * Return the correct form data information for the selected fields
+	 *
+	 * @return array
+	 *
+	 * @since 6.12
+	 */
+	public function form_data() {
+		if ( method_exists( $this->fieldObject, 'form_data' ) ) {
+			$data = $this->fieldObject->form_data();
+		} else {
+			$data = parent::form_data();
+		}
+
+		/* Add image URL / Paths */
+		$label   = $this->get_label();
+		$choices = $this->get_value();
+
+		/* Treat radio and checkbox fields the same */
+		$choices = array_filter( ! is_array( $choices ) ? [ $choices ] : $choices );
+
+		foreach ( $choices as $choice ) {
+			$attachment_id   = $this->get_attachment_id_from_value( $choice );
+			$attachment_data = $this->get_attachment_information( $attachment_id );
+
+			$data['field'][ $this->field->id . '.' . $label . '_image' ][] = $attachment_data;
+			$data['field'][ $this->field->id . '_image' ][]                = $attachment_data;
+			$data['field'][ $label . '_image' ][]                          = $attachment_data;
+		}
+
+		return $data;
+	}
+
+	/**
+	 * Search for a field choice that has the same value and return the attachment ID
+	 *
+	 * @param string $value
+	 *
+	 * @return int The attachment ID or 0 if not found
+	 *
+	 * @since 6.12
+	 */
+	protected function get_attachment_id_from_value( $value ) {
+		$choices = $this->field->choices;
+		if ( ! is_array( $choices ) ) {
+			return 0;
+		}
+
+		foreach ( $choices as $choice ) {
+			$choice_value = $choice['value'] ?? '';
+			if ( $choice_value === $value ) {
+				return $choice['attachment_id'] ?? 0;
+			}
+		}
+
+		return 0;
+	}
+
+	/**
+	 * Return details about the full size image file
+	 *
+	 * @param int $attachment_id
+	 *
+	 * @return array
+	 *
+	 * @since 6.12
+	 */
+	protected function get_attachment_information( $attachment_id ) {
+		$image_url = wp_get_attachment_image_url( $attachment_id, 'full' );
+
+		return [
+			'attachment_id' => $attachment_id,
+			'url'           => $image_url,
+			'path'          => $this->misc->convert_url_to_path( $image_url ),
+			'alt'           => get_post_meta( $attachment_id, '_wp_attachment_image_alt', true ),
+		];
+	}
+}
diff --git a/src/Helper/Fields/Field_Multi_Choice.php b/src/Helper/Fields/Field_Multi_Choice.php
new file mode 100644
index 000000000..552899784
--- /dev/null
+++ b/src/Helper/Fields/Field_Multi_Choice.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace GFPDF\Helper\Fields;
+
+use GF_Field_Multiple_Choice;
+use GFPDF\Helper\Helper_Abstract_Fields;
+use GFPDF\Helper\Helper_Abstract_Fields_Input_Type;
+use GFPDF\Helper\Helper_Abstract_Form;
+use GFPDF\Helper\Helper_Misc;
+
+/**
+ * @package     Gravity PDF
+ * @copyright   Copyright (c) 2024, Blue Liquid Designs
+ * @license     http://opensource.org/licenses/gpl-2.0.php GNU Public License
+ */
+
+/* Exit if accessed directly */
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * Controls the display and output of a Gravity Form field
+ *
+ * @since 6.12
+ */
+class Field_Multi_Choice extends Helper_Abstract_Fields_Input_Type {
+
+}
diff --git a/src/Helper/Fields/Field_Poll.php b/src/Helper/Fields/Field_Poll.php
index a8d785c79..b4722ab1f 100644
--- a/src/Helper/Fields/Field_Poll.php
+++ b/src/Helper/Fields/Field_Poll.php
@@ -2,10 +2,7 @@
 
 namespace GFPDF\Helper\Fields;
 
-use Exception;
-use GFPDF\Helper\Helper_Abstract_Fields;
-use GFPDF\Helper\Helper_Abstract_Form;
-use GFPDF\Helper\Helper_Misc;
+use GFPDF\Helper\Helper_Abstract_Fields_Input_Type;
 
 /**
  * @package     Gravity PDF
@@ -23,61 +20,7 @@
  *
  * @since 4.0
  */
-class Field_Poll extends Helper_Abstract_Fields {
-
-	/**
-	 * Check the appropriate variables are parsed in send to the parent construct
-	 *
-	 * @param object               $field The GF_Field_* Object
-	 * @param array                $entry The Gravity Forms Entry
-	 *
-	 * @param Helper_Abstract_Form $gform
-	 * @param Helper_Misc          $misc
-	 *
-	 * @throws Exception
-	 *
-	 * @since 4.0
-	 */
-	public function __construct( $field, $entry, Helper_Abstract_Form $gform, Helper_Misc $misc ) {
-
-		/* call our parent method */
-		parent::__construct( $field, $entry, $gform, $misc );
-
-		/*
-		 * Custom Field can be any of the following field types:
-		 * single line text, paragraph, dropdown, select, number, checkbox, radio, hidden,
-		 * date, time, phone, website, email, file upload or list
-		 */
-		$class = $this->misc->get_field_class( $field->inputType );
-
-		try {
-			/* check load our class */
-			if ( class_exists( $class ) ) {
-
-				/* See https://docs.gravitypdf.com/v6/developers/filters/gfpdf_field_class/ for more details about these filters */
-				$this->fieldObject = apply_filters( 'gfpdf_field_class', new $class( $field, $entry, $gform, $misc ), $field, $entry, $this->form );
-				$this->fieldObject = apply_filters( 'gfpdf_field_class_' . $field->inputType, $this->fieldObject, $field, $entry, $this->form );
-			} else {
-				throw new Exception( 'Class not found' );
-			}
-		} catch ( Exception $e ) {
-			/* Exception thrown. Load generic field loader */
-			$this->fieldObject = apply_filters( 'gfpdf_field_default_class', new Field_Default( $field, $entry, $gform, $misc ), $field, $entry, $this->form );
-		}
-
-		if ( $this->fieldObject instanceof \GFPDF\Helper\Helper_Interface_Field_Pdf_Config ) {
-			$this->fieldObject->set_pdf_config( $this->get_pdf_config() );
-		}
-	}
-
-	/**
-	 * Used to check if the current field has a value
-	 *
-	 * @since    4.0
-	 */
-	public function is_empty() {
-		return $this->fieldObject->is_empty();
-	}
+class Field_Poll extends Helper_Abstract_Fields_Input_Type {
 
 	/**
 	 * Return the HTML form data
@@ -94,15 +37,13 @@ public function form_data() {
 		$label    = $this->get_label();
 
 		if ( isset( $value[0] ) ) {
-
 			$field = [];
-
 			foreach ( $value as $item ) {
 				/* For backwards compatibility, we'll wrap these in their own array key */
 				$field[0][] = $item['label'];
 			}
 		} else {
-			$field = ( isset( $value['label'] ) ) ? $value['label'] : '';
+			$field = $value['label'] ?? '';
 		}
 
 		$data[ $field_id . '.' . $label ]           = $field;
@@ -112,41 +53,4 @@ public function form_data() {
 
 		return [ 'field' => $data ];
 	}
-
-	/**
-	 * Display the HTML version of this field
-	 *
-	 * @param string $value
-	 * @param bool   $label
-	 *
-	 * @return string
-	 *
-	 * @since 4.0
-	 */
-	public function html( $value = '', $label = true ) {
-		if ( $this->get_output() ) {
-			$this->fieldObject->enable_output();
-		}
-
-		return $this->fieldObject->html();
-	}
-
-	/**
-	 * Get the standard GF value of this field
-	 *
-	 * @return string|array
-	 *
-	 * @since 4.0
-	 */
-	public function value() {
-		if ( $this->fieldObject->has_cache() ) {
-			return $this->cache();
-		}
-
-		$value = $this->fieldObject->value();
-
-		$this->fieldObject->cache( $value );
-
-		return $this->fieldObject->cache();
-	}
 }
diff --git a/src/Helper/Fields/Field_Post_Category.php b/src/Helper/Fields/Field_Post_Category.php
index 44d9fef66..a2681af62 100644
--- a/src/Helper/Fields/Field_Post_Category.php
+++ b/src/Helper/Fields/Field_Post_Category.php
@@ -2,10 +2,7 @@
 
 namespace GFPDF\Helper\Fields;
 
-use Exception;
-use GFPDF\Helper\Helper_Abstract_Fields;
-use GFPDF\Helper\Helper_Abstract_Form;
-use GFPDF\Helper\Helper_Misc;
+use GFPDF\Helper\Helper_Abstract_Fields_Input_Type;
 
 /**
  * @package     Gravity PDF
@@ -23,66 +20,10 @@
  *
  * @since 4.0
  */
-class Field_Post_Category extends Helper_Abstract_Fields {
+class Field_Post_Category extends Helper_Abstract_Fields_Input_Type {
 
 	/**
-	 * Check the appropriate variables are parsed in send to the parent construct
-	 *
-	 * @param object               $field The GF_Field_* Object
-	 * @param array                $entry The Gravity Forms Entry
-	 *
-	 * @param Helper_Abstract_Form $gform
-	 * @param Helper_Misc          $misc
-	 *
-	 * @throws Exception
-	 *
-	 * @since 4.0
-	 */
-	public function __construct( $field, $entry, Helper_Abstract_Form $gform, Helper_Misc $misc ) {
-
-		/* call our parent method */
-		parent::__construct( $field, $entry, $gform, $misc );
-
-		/*
-		 * Category can be multiple field types
-		 * eg. Select, MultiSelect, Radio, Dropdown
-		 */
-		$class = $this->misc->get_field_class( $field->inputType );
-
-		try {
-			/* check load our class */
-			if ( class_exists( $class ) ) {
-
-				/* See https://docs.gravitypdf.com/v6/developers/filters/gfpdf_field_class/ for more details about these filters */
-				$this->fieldObject = apply_filters( 'gfpdf_field_class', new $class( $field, $entry, $gform, $misc ), $field, $entry, $this->form );
-				$this->fieldObject = apply_filters( 'gfpdf_field_class_' . $field->inputType, $this->fieldObject, $field, $entry, $this->form );
-			} else {
-				throw new Exception( 'Class not found' );
-			}
-		} catch ( Exception $e ) {
-			/* Exception thrown. Load generic field loader */
-			$this->fieldObject = apply_filters( 'gfpdf_field_default_class', new Field_Default( $field, $entry, $gform, $misc ), $field, $entry, $this->form );
-		}
-
-		if ( $this->fieldObject instanceof \GFPDF\Helper\Helper_Interface_Field_Pdf_Config ) {
-			$this->fieldObject->set_pdf_config( $this->get_pdf_config() );
-		}
-
-		/* force the fieldObject value cache */
-		$this->value();
-	}
-
-	/**
-	 * Used to check if the current field has a value
-	 *
-	 * @since    4.0
-	 */
-	public function is_empty() {
-		return $this->fieldObject->is_empty();
-	}
-
-	/**
-	 * Return the HTML form data
+	 * Return the form data
 	 *
 	 * @return array
 	 *
@@ -129,24 +70,6 @@ public function form_data() {
 		return $data;
 	}
 
-	/**
-	 * Display the HTML version of this field
-	 *
-	 * @param string $value
-	 * @param bool   $label
-	 *
-	 * @return string
-	 *
-	 * @since 4.0
-	 */
-	public function html( $value = '', $label = true ) {
-		if ( $this->get_output() ) {
-			$this->fieldObject->enable_output();
-		}
-
-		return $this->fieldObject->html();
-	}
-
 	/**
 	 * Get the standard GF value of this field
 	 *
@@ -162,13 +85,13 @@ public function value() {
 		/* get the value from the correct field object */
 		$items = $this->fieldObject->value();
 
-		/**
+		/*
 		 * Standardise the $items format
 		 * The Radio / Select box will return a single-dimensional array,
 		 * while checkbox and multiselect will not.
 		 */
 		$single_dimension = false;
-		if ( isset( $items['label'] ) ) { /* convert single-dimensional array to multi-dimensional */
+		if ( isset( $items['label'] ) ) {
 			$items            = [ $items ];
 			$single_dimension = true;
 		}
@@ -181,10 +104,9 @@ public function value() {
 			$val['value'] = count( $cat ) > 1 ? $cat[1] : $cat[0];
 		}
 
-		/**
-		 * Return in the appropriate format.
-		 * Select / Radio Buttons will not have a multidimensional array
-		 */
+		unset( $val );
+
+		/* Select / Radio Buttons will not have a multidimensional array  */
 		if ( $single_dimension ) {
 			$items = $items[0];
 		}
diff --git a/src/Helper/Fields/Field_Post_Custom_Field.php b/src/Helper/Fields/Field_Post_Custom_Field.php
index bb0a14651..14f7bf3f5 100644
--- a/src/Helper/Fields/Field_Post_Custom_Field.php
+++ b/src/Helper/Fields/Field_Post_Custom_Field.php
@@ -2,10 +2,7 @@
 
 namespace GFPDF\Helper\Fields;
 
-use Exception;
-use GFPDF\Helper\Helper_Abstract_Fields;
-use GFPDF\Helper\Helper_Abstract_Form;
-use GFPDF\Helper\Helper_Misc;
+use GFPDF\Helper\Helper_Abstract_Fields_Input_Type;
 
 /**
  * @package     Gravity PDF
@@ -23,113 +20,6 @@
  *
  * @since 4.0
  */
-class Field_Post_Custom_Field extends Helper_Abstract_Fields {
+class Field_Post_Custom_Field extends Helper_Abstract_Fields_Input_Type {
 
-	/**
-	 * Check the appropriate variables are parsed in send to the parent construct
-	 *
-	 * @param object               $field The GF_Field_* Object
-	 * @param array                $entry The Gravity Forms Entry
-	 *
-	 * @param Helper_Abstract_Form $gform
-	 * @param Helper_Misc          $misc
-	 *
-	 * @throws Exception
-	 *
-	 * @since 4.0
-	 */
-	public function __construct( $field, $entry, Helper_Abstract_Form $gform, Helper_Misc $misc ) {
-
-		/* call our parent method */
-		parent::__construct( $field, $entry, $gform, $misc );
-
-		/*
-		 * Custom Field can be any of the following field types:
-		 * single line text, paragraph, dropdown, select, number, checkbox, radio, hidden,
-		 * date, time, phone, website, email, file upload or list
-		 */
-		$class = $this->misc->get_field_class( $field->inputType );
-
-		try {
-			/* check load our class */
-			if ( class_exists( $class ) ) {
-
-				/* See https://docs.gravitypdf.com/v6/developers/filters/gfpdf_field_class/ for more details about these filters */
-				$this->fieldObject = apply_filters( 'gfpdf_field_class', new $class( $field, $entry, $gform, $misc ), $field, $entry, $this->form );
-				$this->fieldObject = apply_filters( 'gfpdf_field_class_' . $field->inputType, $this->fieldObject, $field, $entry, $this->form );
-			} else {
-				throw new Exception( 'Class not found' );
-			}
-		} catch ( Exception $e ) {
-			/* Exception thrown. Load generic field loader */
-			$this->fieldObject = apply_filters( 'gfpdf_field_default_class', new Field_Default( $field, $entry, $gform, $misc ), $field, $entry, $this->form );
-		}
-
-		if ( $this->fieldObject instanceof \GFPDF\Helper\Helper_Interface_Field_Pdf_Config ) {
-			$this->fieldObject->set_pdf_config( $this->get_pdf_config() );
-		}
-
-		/* force the fieldObject value cache */
-		$this->value();
-	}
-
-	/**
-	 * Used to check if the current field has a value
-	 *
-	 * @since 4.0
-	 */
-	public function is_empty() {
-		return $this->fieldObject->is_empty();
-	}
-
-	/**
-	 * Display the HTML version of this field
-	 *
-	 * @param string $value
-	 * @param bool   $label
-	 *
-	 * @return string
-	 * @since 4.0
-	 */
-	public function html( $value = '', $label = true ) {
-		if ( $this->get_output() ) {
-			$this->fieldObject->enable_output();
-		}
-
-		return $this->fieldObject->html();
-	}
-
-	/**
-	 * Return the correct form data information for the selected fields
-	 *
-	 * @return array
-	 *
-	 * @since 4.0
-	 */
-	public function form_data() {
-		if ( method_exists( $this->fieldObject, 'form_data' ) ) {
-			return $this->fieldObject->form_data();
-		}
-
-		return parent::form_data();
-	}
-
-	/**
-	 * Get the standard GF value of this field
-	 *
-	 * @return string|array
-	 *
-	 * @since 4.0
-	 */
-	public function value() {
-		if ( $this->fieldObject->has_cache() ) {
-			return $this->fieldObject->cache();
-		}
-
-		$value = $this->fieldObject->value();
-
-		$this->fieldObject->cache( $value );
-
-		return $this->fieldObject->cache();
-	}
 }
diff --git a/src/Helper/Fields/Field_Radio.php b/src/Helper/Fields/Field_Radio.php
index dc0065ca9..79551fbc3 100644
--- a/src/Helper/Fields/Field_Radio.php
+++ b/src/Helper/Fields/Field_Radio.php
@@ -61,9 +61,9 @@ public function __construct( $field, $entry, Helper_Abstract_Form $gform, Helper
 	 * @since 4.0
 	 */
 	public function html( $value = '', $label = true ) {
-		$items  = $this->value();
-		$value  = apply_filters( 'gfpdf_show_field_value', false, $this->field, $items ); /* Set to `true` to show a field's value instead of the label */
-		$output = ( $value ) ? $items['value'] : $items['label'];
+		$items      = $this->value();
+		$show_value = apply_filters( 'gfpdf_show_field_value', false, $this->field, $items ); /* Set to `true` to show a field's value instead of the label */
+		$output     = $show_value ? $items['value'] : $items['label'];
 
 		return parent::html( $output );
 	}
diff --git a/src/Helper/Fields/Field_Survey.php b/src/Helper/Fields/Field_Survey.php
index 1226a2c00..b60608c07 100644
--- a/src/Helper/Fields/Field_Survey.php
+++ b/src/Helper/Fields/Field_Survey.php
@@ -2,10 +2,8 @@
 
 namespace GFPDF\Helper\Fields;
 
-use Exception;
 use GFPDF\Helper\Helper_Abstract_Fields;
-use GFPDF\Helper\Helper_Abstract_Form;
-use GFPDF\Helper\Helper_Misc;
+use GFPDF\Helper\Helper_Abstract_Fields_Input_Type;
 
 /**
  * @package     Gravity PDF
@@ -23,89 +21,15 @@
  *
  * @since 4.0
  */
-class Field_Survey extends Helper_Abstract_Fields {
+class Field_Survey extends Helper_Abstract_Fields_Input_Type {
 
 	/**
-	 * Check the appropriate variables are parsed in send to the parent construct
-	 *
-	 * @param object               $field The GF_Field_* Object
-	 * @param array                $entry The Gravity Forms Entry
-	 *
-	 * @param Helper_Abstract_Form $gform
-	 * @param Helper_Misc          $misc
-	 *
-	 * @throws Exception
-	 *
-	 * @since 4.0
-	 */
-	public function __construct( $field, $entry, Helper_Abstract_Form $gform, Helper_Misc $misc ) {
-
-		/* call our parent method */
-		parent::__construct( $field, $entry, $gform, $misc );
-
-		/*
-		 * Survey Field can be any of the following:
-		 * single line text, paragraph, dropdown, select, checkbox,
-		 * likert, rank or rating
-		 */
-		$class = $this->misc->get_field_class( $field->inputType );
-
-		try {
-			/* check load our class */
-			if ( class_exists( $class ) ) {
-
-				/* See https://docs.gravitypdf.com/v6/developers/filters/gfpdf_field_class/ for more details about these filters */
-				$this->fieldObject = apply_filters( 'gfpdf_field_class', new $class( $field, $entry, $gform, $misc ), $field, $entry, $this->form );
-				$this->fieldObject = apply_filters( 'gfpdf_field_class_' . $field->inputType, $this->fieldObject, $field, $entry, $this->form );
-			} else {
-				throw new Exception();
-			}
-		} catch ( Exception $e ) {
-			/* Exception thrown. Load generic field loader */
-			$this->fieldObject = apply_filters( 'gfpdf_field_default_class', new Field_Default( $field, $entry, $gform, $misc ), $field, $entry, $this->form );
-		}
-
-		if ( $this->fieldObject instanceof \GFPDF\Helper\Helper_Interface_Field_Pdf_Config ) {
-			$this->fieldObject->set_pdf_config( $this->get_pdf_config() );
-		}
-
-		/* force the fieldObject value cache */
-		$this->value();
-	}
-
-	/**
-	 * Get the $form_data object
-	 * Survey field uses multiple field types so we need to account for that
+	 * Return the field form data
 	 *
 	 * @return array
 	 *
 	 * @since 4.0
 	 */
-	private function get_form_data() {
-		if ( method_exists( $this->fieldObject, 'form_data' ) ) {
-			return $this->fieldObject->form_data();
-		}
-
-		return parent::form_data();
-	}
-
-	/**
-	 * Used to check if the current field has a value
-	 *
-	 * @since    4.0
-	 */
-	public function is_empty() {
-		return $this->fieldObject->is_empty();
-	}
-
-	/**
-	 * Return the HTML form data
-	 *
-	 * @return array
-	 *
-	 * @since 4.0
-	 *
-	 */
 	public function form_data() {
 
 		$data     = [];
@@ -115,7 +39,7 @@ public function form_data() {
 		switch ( $this->field->inputType ) {
 			case 'radio':
 			case 'select':
-				$data  = $this->get_form_data();
+				$data  = parent::form_data();
 				$value = $data['field'][ $this->field->id . '_name' ];
 
 				/* Overriding survey radio values with name */
@@ -126,7 +50,6 @@ function( &$item, $key, $value ) {
 					},
 					$value
 				);
-
 				break;
 
 			case 'checkbox':
@@ -154,11 +77,10 @@ function( &$item, $key, $value ) {
 				$data[ $label ]                   = $value;
 
 				$data = [ 'field' => $data ];
-
 				break;
 
 			default:
-				$data = $this->get_form_data();
+				$data = parent::form_data();
 				break;
 		}
 
@@ -179,7 +101,7 @@ public function html( $value = '', $label = true ) {
 
 		/* Return early to prevent unwanted details being displayed when the plugin isn't enabled */
 		if ( ! class_exists( 'GFSurvey' ) ) {
-			return parent::html( '' );
+			return Helper_Abstract_Fields::html( '' );
 		}
 
 		if ( $this->get_output() ) {
@@ -188,22 +110,4 @@ public function html( $value = '', $label = true ) {
 
 		return $this->fieldObject->html();
 	}
-
-	/**
-	 * Get the standard GF value of this field
-	 *
-	 * @return string|array
-	 * @since 4.0
-	 */
-	public function value() {
-		if ( $this->fieldObject->has_cache() ) {
-			return $this->fieldObject->cache();
-		}
-
-		$value = $this->fieldObject->value();
-
-		$this->fieldObject->cache( $value );
-
-		return $this->fieldObject->cache();
-	}
 }
diff --git a/src/Helper/Helper_Abstract_Fields_Input_Type.php b/src/Helper/Helper_Abstract_Fields_Input_Type.php
new file mode 100644
index 000000000..dc7e715c0
--- /dev/null
+++ b/src/Helper/Helper_Abstract_Fields_Input_Type.php
@@ -0,0 +1,125 @@
+<?php
+
+namespace GFPDF\Helper;
+
+use Exception;
+use GFPDF\Helper\Fields\GF_Field;
+
+/**
+ * @package     Gravity PDF
+ * @copyright   Copyright (c) 2024, Blue Liquid Designs
+ * @license     http://opensource.org/licenses/gpl-2.0.php GNU Public License
+ */
+
+/* Exit if accessed directly */
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * A helper class to display Gravity Forms fields that can masquerade as different field types
+ *
+ * @since 6.12
+ */
+abstract class Helper_Abstract_Fields_Input_Type extends Helper_Abstract_Fields {
+
+	/**
+	 * @param GF_Field             $field The GF_Field_* Object
+	 * @param array                $entry The Gravity Forms Entry
+	 *
+	 * @param Helper_Abstract_Form $gform
+	 * @param Helper_Misc          $misc
+	 *
+	 * @throws Exception
+	 *
+	 * @since 6.12
+	 */
+	public function __construct( $field, $entry, Helper_Abstract_Form $gform, Helper_Misc $misc ) {
+		parent::__construct( $field, $entry, $gform, $misc );
+
+		/* Try and load the masquerading field */
+		$class = $this->misc->get_field_class( $field->inputType );
+
+		try {
+			/* check load our class */
+			if ( class_exists( $class ) ) {
+
+				/* See https://docs.gravitypdf.com/v6/developers/filters/gfpdf_field_class/ for more details about these filters */
+				$this->fieldObject = apply_filters( 'gfpdf_field_class', new $class( $field, $entry, $gform, $misc ), $field, $entry, $this->form );
+				$this->fieldObject = apply_filters( 'gfpdf_field_class_' . $field->inputType, $this->fieldObject, $field, $entry, $this->form );
+			} else {
+				throw new Exception( 'Class not found' );
+			}
+		} catch ( Exception $e ) {
+			/* Exception thrown. Load generic field loader */
+			$this->fieldObject = apply_filters( 'gfpdf_field_default_class', new Field_Default( $field, $entry, $gform, $misc ), $field, $entry, $this->form );
+		}
+
+		if ( $this->fieldObject instanceof \GFPDF\Helper\Helper_Interface_Field_Pdf_Config ) {
+			$this->fieldObject->set_pdf_config( $this->get_pdf_config() );
+		}
+
+		/* force the fieldObject value cache */
+		$this->value();
+	}
+
+	/**
+	 * Used to check if the current field has a value
+	 *
+	 * @since 6.12
+	 */
+	public function is_empty() {
+		return $this->fieldObject->is_empty();
+	}
+
+	/**
+	 * Display the HTML version of this field
+	 *
+	 * @param string $value
+	 * @param bool   $label
+	 *
+	 * @return string
+	 * @since 6.12
+	 */
+	public function html( $value = '', $label = true ) {
+		if ( $this->get_output() ) {
+			$this->fieldObject->enable_output();
+		}
+
+		return $this->fieldObject->html();
+	}
+
+	/**
+	 * Return the correct form data information for the selected fields
+	 *
+	 * @return array
+	 *
+	 * @since 6.12
+	 */
+	public function form_data() {
+		if ( method_exists( $this->fieldObject, 'form_data' ) ) {
+			return $this->fieldObject->form_data();
+		}
+
+		return parent::form_data();
+	}
+
+	/**
+	 * Get the standard GF value of this field
+	 *
+	 * @return string|array
+	 *
+	 * @since 6.12
+	 */
+	public function value() {
+		if ( $this->fieldObject->has_cache() ) {
+			return $this->fieldObject->cache();
+		}
+
+		$value = $this->fieldObject->value();
+
+		$this->fieldObject->cache( $value );
+
+		return $this->fieldObject->cache();
+	}
+}
diff --git a/tests/e2e/advanced-checks/confirmation-shortcode.test.js b/tests/e2e/advanced-checks/confirmation-shortcode.test.js
index 63bb3459c..f4a26612a 100644
--- a/tests/e2e/advanced-checks/confirmation-shortcode.test.js
+++ b/tests/e2e/advanced-checks/confirmation-shortcode.test.js
@@ -66,7 +66,7 @@ test('should check if the shortcode confirmation type PAGE is working correctly'
 
   await t
     .click(page.addBlockIcon)
-    .typeText(page.searchBlock, 'shortcode', { paste: true })
+    .typeText(page.searchBlock.filterVisible(), 'shortcode', { paste: true })
     .click(page.shortcodeLink)
     .typeText(page.shortcodeTextarea, shortcodeHolder)
     .click(page.updateButton)
@@ -81,8 +81,8 @@ test('should check if the shortcode confirmation type PAGE is working correctly'
     .typeText(run.queryStringInputBox, 'entry={entry_id}', { paste: true })
     .click(run.saveConfirmationButton)
 
-    const url = await run.previewLink.href
-    await t.navigateTo(url)
+  const url = await run.previewLink.href
+  await t.navigateTo(url)
     .typeText(run.formInputField, 'test', { paste: true })
     .click(run.submitButton)
   downloadUrl = await Selector('.gravitypdf-download-link').getAttribute('href')
diff --git a/tests/e2e/advanced-checks/pdf-restriction.test.js b/tests/e2e/advanced-checks/pdf-restriction.test.js
index 14ebb4ea3..52224ed6c 100644
--- a/tests/e2e/advanced-checks/pdf-restriction.test.js
+++ b/tests/e2e/advanced-checks/pdf-restriction.test.js
@@ -33,7 +33,7 @@ test('should redirect to WP login page if \'Restrict Owner\' is enabled', async
   await t
     .click(page.testPageLink)
     .click(page.addBlockIcon)
-    .typeText(page.searchBlock, 'shortcode', { paste: true })
+    .typeText(page.searchBlock.filterVisible(), 'shortcode', { paste: true })
     .click(page.shortcodeLink)
     .typeText(page.shortcodeTextarea, '[gravityform id=4 title=false description=false ajax=true tabindex=49]', { paste: true })
     .click(page.updateButton)
diff --git a/tests/e2e/utilities/page-model/helpers/page.js b/tests/e2e/utilities/page-model/helpers/page.js
index f4dfc8c1c..2b5f9f8b5 100644
--- a/tests/e2e/utilities/page-model/helpers/page.js
+++ b/tests/e2e/utilities/page-model/helpers/page.js
@@ -34,7 +34,7 @@ class Page {
     await t
       .typeText(this.titleField, 'Test-page', { paste: true })
       .click(this.addBlockIcon)
-      .typeText(this.searchBlock, 'paragraph', { paste: true })
+      .typeText(this.searchBlock.filterVisible(), 'paragraph', { paste: true })
       .click(this.paragraphButton)
       .typeText(Selector('.is-root-container p:last-of-type'), 'Content', { paste: true })
       .click(this.publishButton)
diff --git a/tests/phpunit/data/images/test-media.png b/tests/phpunit/data/images/test-media.png
new file mode 100644
index 000000000..1d722423a
Binary files /dev/null and b/tests/phpunit/data/images/test-media.png differ
diff --git a/tests/phpunit/unit-tests/Helper/Fields/Test_Field_Image_Choice.php b/tests/phpunit/unit-tests/Helper/Fields/Test_Field_Image_Choice.php
new file mode 100644
index 000000000..672bf7089
--- /dev/null
+++ b/tests/phpunit/unit-tests/Helper/Fields/Test_Field_Image_Choice.php
@@ -0,0 +1,273 @@
+<?php
+
+declare( strict_types=1 );
+
+namespace GFPDF\Helper\Fields;
+
+use GF_UnitTest_Factory;
+use WP_UnitTestCase;
+
+/**
+ * @package     Gravity PDF
+ * @copyright   Copyright (c) 2024, Blue Liquid Designs
+ * @license     http://opensource.org/licenses/gpl-2.0.php GNU Public License
+ */
+
+/**
+ * @group   helper
+ * @group   fields
+ */
+class Test_Field_Image_Choice extends WP_UnitTestCase {
+	/**
+	 * @var array
+	 */
+	protected $form;
+
+	/**
+	 * @var GF_UnitTest_Factory
+	 */
+	protected $factory;
+
+	public function set_up() {
+		parent::set_up();
+
+		$this->factory = new GF_UnitTest_Factory();
+
+		/* Create a form with checkbox and radio Multi Choice fields */
+		$options1 = $this->get_choices( 1 );
+		$options2 = $this->get_choices( 2 );
+
+		$this->form = $this->factory->form->create_and_get( [
+			'fields' => [
+				[
+					'id'                => 1,
+					'label'             => 'Radio Multi Choice',
+					'type'              => 'image_choice',
+					'inputType'         => 'radio',
+					'choices'           => $options1['choices'],
+					'inputs'            => $options1['inputs'],
+					'enableOtherChoice' => true,
+				],
+
+				[
+					'id'                => 2,
+					'label'             => 'Checkbox Multi Choice',
+					'type'              => 'image_choice',
+					'inputType'         => 'checkbox',
+					'choices'           => $options2['choices'],
+					'inputs'            => $options2['inputs'],
+					'enableOtherChoice' => true,
+				],
+			],
+		] );
+	}
+
+	protected function get_choices( $id ) {
+		$wp_factory = static::factory();
+		$media_id1  = $wp_factory->attachment->create_upload_object( __DIR__ . '/../../../data/images/test-media.png' );
+		$media_id2  = $wp_factory->attachment->create_upload_object( __DIR__ . '/../../../data/images/test-media.png' );
+
+		$choices = [
+			[
+				'text'          => 'Option 1',
+				'value'         => 'o1',
+				'key'           => 'abc',
+				'file_url'      => wp_get_attachment_image_src( $media_id1 ),
+				'attachment_id' => $media_id1,
+			],
+
+			[
+				'text'  => 'Option 2',
+				'value' => 'o2',
+				'key'   => 'def',
+			],
+
+			[
+				'text'          => '<strong>Option</strong> 3',
+				'value'         => 'o3',
+				'key'           => 'ghi',
+				'file_url'      => wp_get_attachment_image_src( $media_id2 ),
+				'attachment_id' => $media_id2,
+			],
+
+			[
+				'text'  => 'Select an option',
+				'value' => '',
+				'key'   => 'jkl',
+			],
+		];
+
+		$inputs = [
+			[
+				'id'    => $id . '.1',
+				'label' => 'Option 1',
+				'key'   => 'abc',
+			],
+
+			[
+				'id'    => $id . '.2',
+				'label' => 'Option 2',
+				'key'   => 'def',
+			],
+
+			[
+				'id'    => $id . '.3',
+				'label' => 'Option 3',
+				'key'   => 'ghi',
+			],
+
+			[
+				'id'    => $id . '.4',
+				'label' => 'Select an option',
+				'key'   => 'jkl',
+			],
+		];
+
+		return [
+			'choices' => $choices,
+			'inputs'  => $inputs,
+		];
+	}
+
+	public function test_radio_html() {
+		$entry = $this->factory->entry->create_and_get( [
+			'form_id' => $this->form['id'],
+			'1'       => 'o2',
+		] );
+
+		$field     = $this->form['fields'][0];
+		$pdf_field = new Field_Image_Choice( $field, $entry, \GPDFAPI::get_form_class(), \GPDFAPI::get_misc_class() );
+
+		$html = $pdf_field->html();
+		$this->assertStringContainsString( '<div id="field-1" class="gfpdf-field gfpdf-radio ">', $html );
+		$this->assertStringContainsString( '<div class="label"><strong>Radio Multi Choice</strong></div><div class="value">Option 2</div>', $html );
+	}
+
+	public function test_radio_html_with_markup() {
+		$entry = $this->factory->entry->create_and_get( [
+			'form_id' => $this->form['id'],
+			'1'       => 'o3',
+		] );
+
+		$field     = $this->form['fields'][0];
+		$pdf_field = new Field_Image_Choice( $field, $entry, \GPDFAPI::get_form_class(), \GPDFAPI::get_misc_class() );
+
+		$html = $pdf_field->html();
+		$this->assertStringContainsString( '<div id="field-1" class="gfpdf-field gfpdf-radio ">', $html );
+		$this->assertStringContainsString( '<div class="label"><strong>Radio Multi Choice</strong></div><div class="value"><strong>Option</strong> 3</div>', $html );
+
+		/* pass user-defined string and verify response is escaped in the PDF */
+		$entry = $this->factory->entry->create_and_get( [
+			'form_id' => $this->form['id'],
+			'1'       => '<em>My answer</em>',
+		] );
+
+		$pdf_field = new Field_Image_Choice( $field, $entry, \GPDFAPI::get_form_class(), \GPDFAPI::get_misc_class() );
+
+		$html = $pdf_field->html();
+		$this->assertStringContainsString( '<div id="field-1" class="gfpdf-field gfpdf-radio ">', $html );
+		$this->assertStringContainsString( '<div class="label"><strong>Radio Multi Choice</strong></div><div class="value">&lt;em&gt;My answer&lt;/em&gt;</div>', $html );
+	}
+
+	public function test_radio_html_with_empty_value_but_not_label() {
+		$entry = $this->factory->entry->create_and_get( [
+			'form_id' => $this->form['id'],
+			'1'       => '',
+		] );
+
+		$field     = $this->form['fields'][0];
+		$pdf_field = new Field_Image_Choice( $field, $entry, \GPDFAPI::get_form_class(), \GPDFAPI::get_misc_class() );
+
+		$html = $pdf_field->html();
+		$this->assertStringContainsString( '<div id="field-1" class="gfpdf-field gfpdf-radio ">', $html );
+		$this->assertStringContainsString( '<div class="label"><strong>Radio Multi Choice</strong></div><div class="value">Select an option</div>', $html );
+	}
+
+	public function test_radio_form_data() {
+		$entry = $this->factory->entry->create_and_get( [
+			'form_id' => $this->form['id'],
+			'1'       => 'o3',
+		] );
+
+		$field     = $this->form['fields'][0];
+		$pdf_field = new Field_Image_Choice( $field, $entry, \GPDFAPI::get_form_class(), \GPDFAPI::get_misc_class() );
+
+		$form_data = $pdf_field->form_data();
+
+		$this->assertSame( 'o3', $form_data['field'][1] );
+		$this->assertSame( 'o3', $form_data['field']['1.Radio Multi Choice'] );
+		$this->assertSame( 'o3', $form_data['field']['Radio Multi Choice'] );
+
+		$this->assertSame( '<strong>Option</strong> 3', $form_data['field']['1_name'] );
+		$this->assertSame( '<strong>Option</strong> 3', $form_data['field']['1.Radio Multi Choice_name'] );
+		$this->assertSame( '<strong>Option</strong> 3', $form_data['field']['Radio Multi Choice_name'] );
+
+		foreach ( [ '1_image', '1.Radio Multi Choice_image', 'Radio Multi Choice_image' ] as $id ) {
+			$this->assertArrayHasKey( 'attachment_id', $form_data['field'][ $id ][0] );
+			$this->assertArrayHasKey( 'url', $form_data['field'][ $id ][0] );
+			$this->assertArrayHasKey( 'path', $form_data['field'][ $id ][0] );
+			$this->assertArrayHasKey( 'alt', $form_data['field'][ $id ][0] );
+
+			$this->assertIsInt( $form_data['field'][ $id ][0]['attachment_id'] );
+			$this->assertStringStartsWith( 'http://', $form_data['field'][ $id ][0]['url'] );
+			$this->assertStringStartsWith( '/', $form_data['field'][ $id ][0]['path'] );
+		}
+	}
+
+	public function test_checkbox_html() {
+		$entry = $this->factory->entry->create_and_get( [
+			'form_id' => $this->form['id'],
+			'2.1'     => 'o1',
+			'2.2'     => '',
+			'2.3'     => 'o3',
+		] );
+
+		$field     = $this->form['fields'][1];
+		$pdf_field = new Field_Image_Choice( $field, $entry, \GPDFAPI::get_form_class(), \GPDFAPI::get_misc_class() );
+
+		$html = $pdf_field->html();
+		$this->assertStringContainsString( '<div id="field-2" class="gfpdf-field gfpdf-checkbox ">', $html );
+		$this->assertStringContainsString( '<div class="label"><strong>Checkbox Multi Choice</strong></div><div class="value"><ul class="bulleted checkbox"><li id="field-2-option-1">Option 1</li><li id="field-2-option-2"><strong>Option</strong> 3</li></ul></div>', $html );
+	}
+
+	public function test_checkbox_form_data() {
+		$entry = $this->factory->entry->create_and_get( [
+			'form_id' => $this->form['id'],
+			'2.1'     => 'o1',
+			'2.2'     => '',
+			'2.3'     => 'o3',
+		] );
+
+		$field     = $this->form['fields'][1];
+		$pdf_field = new Field_Image_Choice( $field, $entry, \GPDFAPI::get_form_class(), \GPDFAPI::get_misc_class() );
+
+		$form_data = $pdf_field->form_data();
+
+		$this->assertSame( 'o1', $form_data['field'][2][0] );
+		$this->assertSame( 'o3', $form_data['field'][2][1] );
+		$this->assertSame( 'o1', $form_data['field']['2.Checkbox Multi Choice'][0] );
+		$this->assertSame( 'o3', $form_data['field']['2.Checkbox Multi Choice'][1] );
+		$this->assertSame( 'o1', $form_data['field']['Checkbox Multi Choice'][0] );
+		$this->assertSame( 'o3', $form_data['field']['Checkbox Multi Choice'][1] );
+
+		$this->assertSame( 'Option 1', $form_data['field']['2_name'][0] );
+		$this->assertSame( '<strong>Option</strong> 3', $form_data['field']['2_name'][1] );
+		$this->assertSame( 'Option 1', $form_data['field']['2.Checkbox Multi Choice_name'][0] );
+		$this->assertSame( '<strong>Option</strong> 3', $form_data['field']['2.Checkbox Multi Choice_name'][1] );
+		$this->assertSame( 'Option 1', $form_data['field']['Checkbox Multi Choice_name'][0] );
+		$this->assertSame( '<strong>Option</strong> 3', $form_data['field']['Checkbox Multi Choice_name'][1] );
+
+		foreach ( [ '2_image', '2.Checkbox Multi Choice_image', 'Checkbox Multi Choice_image' ] as $id ) {
+			for ( $i = 0; $i <= 1; $i++ ) {
+				$this->assertArrayHasKey( 'attachment_id', $form_data['field'][ $id ][ $i ] );
+				$this->assertArrayHasKey( 'url', $form_data['field'][ $id ][ $i ] );
+				$this->assertArrayHasKey( 'path', $form_data['field'][ $id ][ $i ] );
+				$this->assertArrayHasKey( 'alt', $form_data['field'][ $id ][ $i ] );
+
+				$this->assertIsInt( $form_data['field'][ $id ][ $i ]['attachment_id'] );
+				$this->assertStringStartsWith( 'http://', $form_data['field'][ $id ][ $i ]['url'] );
+				$this->assertStringStartsWith( '/', $form_data['field'][ $id ][ $i ]['path'] );
+			}
+		}
+	}
+}
diff --git a/tests/phpunit/unit-tests/Helper/Fields/Test_Field_Multi_Choice.php b/tests/phpunit/unit-tests/Helper/Fields/Test_Field_Multi_Choice.php
new file mode 100644
index 000000000..fdb6c52e0
--- /dev/null
+++ b/tests/phpunit/unit-tests/Helper/Fields/Test_Field_Multi_Choice.php
@@ -0,0 +1,241 @@
+<?php
+
+declare( strict_types=1 );
+
+namespace GFPDF\Helper\Fields;
+
+use GF_UnitTest_Factory;
+use WP_UnitTestCase;
+
+/**
+ * @package     Gravity PDF
+ * @copyright   Copyright (c) 2024, Blue Liquid Designs
+ * @license     http://opensource.org/licenses/gpl-2.0.php GNU Public License
+ */
+
+/**
+ * @group   helper
+ * @group   fields
+ */
+class Test_Field_Multi_Choice extends WP_UnitTestCase {
+	/**
+	 * @var array
+	 */
+	protected $form;
+
+	/**
+	 * @var GF_UnitTest_Factory
+	 */
+	protected $factory;
+
+	public function set_up() {
+		parent::set_up();
+
+		$this->factory = new GF_UnitTest_Factory();
+
+		/* Create a form with checkbox and radio Multi Choice fields */
+		$options1 = $this->get_choices( 1 );
+		$options2 = $this->get_choices( 2 );
+
+		$this->form = $this->factory->form->create_and_get( [
+			'fields' => [
+				[
+					'id'                => 1,
+					'label'             => 'Radio Multi Choice',
+					'type'              => 'multi_choice',
+					'inputType'         => 'radio',
+					'choices'           => $options1['choices'],
+					'inputs'            => $options1['inputs'],
+					'enableOtherChoice' => true,
+				],
+
+				[
+					'id'                => 2,
+					'label'             => 'Checkbox Multi Choice',
+					'type'              => 'multi_choice',
+					'inputType'         => 'checkbox',
+					'choices'           => $options2['choices'],
+					'inputs'            => $options2['inputs'],
+					'enableOtherChoice' => true,
+				],
+			],
+		] );
+	}
+
+	protected function get_choices( $id ) {
+		$choices = [
+			[
+				'text'  => 'Option 1',
+				'value' => 'o1',
+				'key'   => 'abc',
+			],
+
+			[
+				'text'  => 'Option 2',
+				'value' => 'o2',
+				'key'   => 'def',
+			],
+
+			[
+				'text'  => '<strong>Option</strong> 3',
+				'value' => 'o3',
+				'key'   => 'ghi',
+			],
+
+			[
+				'text'  => 'Select an option',
+				'value' => '',
+				'key'   => 'jkl',
+			],
+		];
+
+		$inputs = [
+			[
+				'id'    => $id . '.1',
+				'label' => 'Option 1',
+				'key'   => 'abc',
+			],
+
+			[
+				'id'    => $id . '.2',
+				'label' => 'Option 2',
+				'key'   => 'def',
+			],
+
+			[
+				'id'    => $id . '.3',
+				'label' => 'Option 3',
+				'key'   => 'ghi',
+			],
+
+			[
+				'id'    => $id . '.4',
+				'label' => 'Select an option',
+				'key'   => 'jkl',
+			],
+		];
+
+		return [
+			'choices' => $choices,
+			'inputs'  => $inputs,
+		];
+	}
+
+	public function test_radio_html() {
+		$entry = $this->factory->entry->create_and_get( [
+			'form_id' => $this->form['id'],
+			'1'       => 'o2',
+		] );
+
+		$field     = $this->form['fields'][0];
+		$pdf_field = new Field_Multi_Choice( $field, $entry, \GPDFAPI::get_form_class(), \GPDFAPI::get_misc_class() );
+
+		$html = $pdf_field->html();
+		$this->assertStringContainsString( '<div id="field-1" class="gfpdf-field gfpdf-radio ">', $html );
+		$this->assertStringContainsString( '<div class="label"><strong>Radio Multi Choice</strong></div><div class="value">Option 2</div>', $html );
+	}
+
+	public function test_radio_html_with_markup() {
+		$entry = $this->factory->entry->create_and_get( [
+			'form_id' => $this->form['id'],
+			'1'       => 'o3',
+		] );
+
+		$field     = $this->form['fields'][0];
+		$pdf_field = new Field_Multi_Choice( $field, $entry, \GPDFAPI::get_form_class(), \GPDFAPI::get_misc_class() );
+
+		$html = $pdf_field->html();
+		$this->assertStringContainsString( '<div id="field-1" class="gfpdf-field gfpdf-radio ">', $html );
+		$this->assertStringContainsString( '<div class="label"><strong>Radio Multi Choice</strong></div><div class="value"><strong>Option</strong> 3</div>', $html );
+
+		/* pass user-defined string and verify response is escaped in the PDF */
+		$entry = $this->factory->entry->create_and_get( [
+			'form_id' => $this->form['id'],
+			'1'       => '<em>My answer</em>',
+		] );
+
+		$pdf_field = new Field_Multi_Choice( $field, $entry, \GPDFAPI::get_form_class(), \GPDFAPI::get_misc_class() );
+
+		$html = $pdf_field->html();
+		$this->assertStringContainsString( '<div id="field-1" class="gfpdf-field gfpdf-radio ">', $html );
+		$this->assertStringContainsString( '<div class="label"><strong>Radio Multi Choice</strong></div><div class="value">&lt;em&gt;My answer&lt;/em&gt;</div>', $html );
+	}
+
+	public function test_radio_html_with_empty_value_but_not_label() {
+		$entry = $this->factory->entry->create_and_get( [
+			'form_id' => $this->form['id'],
+			'1'       => '',
+		] );
+
+		$field     = $this->form['fields'][0];
+		$pdf_field = new Field_Multi_Choice( $field, $entry, \GPDFAPI::get_form_class(), \GPDFAPI::get_misc_class() );
+
+		$html = $pdf_field->html();
+		$this->assertStringContainsString( '<div id="field-1" class="gfpdf-field gfpdf-radio ">', $html );
+		$this->assertStringContainsString( '<div class="label"><strong>Radio Multi Choice</strong></div><div class="value">Select an option</div>', $html );
+	}
+
+	public function test_radio_form_data() {
+		$entry = $this->factory->entry->create_and_get( [
+			'form_id' => $this->form['id'],
+			'1'       => 'o2',
+		] );
+
+		$field     = $this->form['fields'][0];
+		$pdf_field = new Field_Multi_Choice( $field, $entry, \GPDFAPI::get_form_class(), \GPDFAPI::get_misc_class() );
+
+		$form_data = $pdf_field->form_data();
+
+		$this->assertSame( 'o2', $form_data['field'][1] );
+		$this->assertSame( 'o2', $form_data['field']['1.Radio Multi Choice'] );
+		$this->assertSame( 'o2', $form_data['field']['Radio Multi Choice'] );
+
+		$this->assertSame( 'Option 2', $form_data['field']['1_name'] );
+		$this->assertSame( 'Option 2', $form_data['field']['1.Radio Multi Choice_name'] );
+		$this->assertSame( 'Option 2', $form_data['field']['Radio Multi Choice_name'] );
+	}
+
+	public function test_checkbox_html() {
+		$entry = $this->factory->entry->create_and_get( [
+			'form_id' => $this->form['id'],
+			'2.1'     => 'o1',
+			'2.2'     => '',
+			'2.3'     => 'o3',
+		] );
+
+		$field     = $this->form['fields'][1];
+		$pdf_field = new Field_Multi_Choice( $field, $entry, \GPDFAPI::get_form_class(), \GPDFAPI::get_misc_class() );
+
+		$html = $pdf_field->html();
+		$this->assertStringContainsString( '<div id="field-2" class="gfpdf-field gfpdf-checkbox ">', $html );
+		$this->assertStringContainsString( '<div class="label"><strong>Checkbox Multi Choice</strong></div><div class="value"><ul class="bulleted checkbox"><li id="field-2-option-1">Option 1</li><li id="field-2-option-2"><strong>Option</strong> 3</li></ul></div>', $html );
+	}
+
+	public function test_checkbox_form_data() {
+		$entry = $this->factory->entry->create_and_get( [
+			'form_id' => $this->form['id'],
+			'2.1'     => 'o1',
+			'2.2'     => '',
+			'2.3'     => 'o3',
+		] );
+
+		$field     = $this->form['fields'][1];
+		$pdf_field = new Field_Multi_Choice( $field, $entry, \GPDFAPI::get_form_class(), \GPDFAPI::get_misc_class() );
+
+		$form_data = $pdf_field->form_data();
+
+		$this->assertSame( 'o1', $form_data['field'][2][0] );
+		$this->assertSame( 'o3', $form_data['field'][2][1] );
+		$this->assertSame( 'o1', $form_data['field']['2.Checkbox Multi Choice'][0] );
+		$this->assertSame( 'o3', $form_data['field']['2.Checkbox Multi Choice'][1] );
+		$this->assertSame( 'o1', $form_data['field']['Checkbox Multi Choice'][0] );
+		$this->assertSame( 'o3', $form_data['field']['Checkbox Multi Choice'][1] );
+
+		$this->assertSame( 'Option 1', $form_data['field']['2_name'][0] );
+		$this->assertSame( '<strong>Option</strong> 3', $form_data['field']['2_name'][1] );
+		$this->assertSame( 'Option 1', $form_data['field']['2.Checkbox Multi Choice_name'][0] );
+		$this->assertSame( '<strong>Option</strong> 3', $form_data['field']['2.Checkbox Multi Choice_name'][1] );
+		$this->assertSame( 'Option 1', $form_data['field']['Checkbox Multi Choice_name'][0] );
+		$this->assertSame( '<strong>Option</strong> 3', $form_data['field']['Checkbox Multi Choice_name'][1] );
+	}
+}