diff --git a/includes/core/class-fields.php b/includes/core/class-fields.php
index b87734c0..73544566 100644
--- a/includes/core/class-fields.php
+++ b/includes/core/class-fields.php
@@ -41,6 +41,31 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 		 */
 		public $timestamp = null;
 
+		/**
+		 * @var array
+		 */
+		public $global_args = array();
+
+		/**
+		 * @var array
+		 */
+		public $field_icons = array();
+
+		/**
+		 * @var array
+		 */
+		public $get_fields = array();
+
+		/**
+		 * @var array
+		 */
+		public $rows = array();
+
+		/**
+		 * @var array
+		 */
+		public $fields = array();
+
 		/**
 		 * Fields constructor.
 		 */
@@ -2393,7 +2418,9 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 					}
 
 					$field_name = $key . UM()->form()->form_suffix;
-					$field_value = htmlspecialchars( $this->field_value( $key, $default, $data ) );
+
+					$field_value = $this->field_value( $key, $default, $data );
+					$field_value = ! is_null( $field_value ) ? htmlspecialchars( $field_value ) : null;
 
 					$output .= '<input ' . $disabled . ' autocomplete="' . esc_attr( $autocomplete ) . '" class="' . $this->get_class( $key, $data ) . '" type="' . esc_attr( $input ) . '" name="' . esc_attr( $field_name ) . '" id="' . esc_attr( $field_name ) . '" value="' . esc_attr( $field_value ) . '" placeholder="' . esc_attr( $placeholder ) . '" data-validate="' . esc_attr( $validate ) . '" data-key="' . esc_attr( $key ) . '" />
 
diff --git a/includes/core/class-shortcodes.php b/includes/core/class-shortcodes.php
index b7aa3a74..d7f02e4d 100644
--- a/includes/core/class-shortcodes.php
+++ b/includes/core/class-shortcodes.php
@@ -1,12 +1,12 @@
 <?php
 namespace um\core;
 
-// Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) exit;
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
 
 if ( ! class_exists( 'um\core\Shortcodes' ) ) {
 
-
 	/**
 	 * Class Shortcodes
 	 * @package um\core
@@ -38,6 +38,21 @@ if ( ! class_exists( 'um\core\Shortcodes' ) ) {
 		 */
 		public $emoji = array();
 
+		/**
+		 * @var null|int
+		 */
+		public $form_id = null;
+
+		/**
+		 * @var null|string
+		 */
+		public $form_status = null;
+
+		/**
+		 * @var array
+		 */
+		public $set_args = array();
+
 		/**
 		 * Shortcodes constructor.
 		 */