diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3147b5a6..d17d6c57 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,25 +6,34 @@ This projects adheres to [Semantic Versioning](https://semver.org/) and [Keep a
 
 ## [2.3.6]
 
-## Fixed
+### Added
+- Workable, domain data from source and medium.
+- Hubspot phonenumber field.
+
+### Fixed
+- Trash url bug fix.
+
+## [2.3.6]
+
+### Fixed
 - Workable, custom body and heading max length field
 - Workable fallback email removed text base encoded file.
 
 ## [2.3.5]
 
-## Fixed
+### Fixed
 - ability for Hubspot select field to show placeholder.
 
 ## [2.3.4]
 
-## Changed
+### Changed
 - updated FE Libs to v8.
 - updated other packages.
 
-## Fixed
+### Fixed
 - fixed some Gutenberg button component prop changes. 
 
-## Note
+### Note
 - Form picker has an auxiliary attribute now to store the full data (label & value) of the selected form - the current param is ID only. To keep everything functioning, the existing ID is used if the new attribute is not set, however that will lead to the form label being blank. This is expected, and the form will still work fine. You can re-select the form to fix this.
 - Feel free to ignore PHPCS/Stan for now, it'll be solved in the next release.
 
diff --git a/eightshift-forms.php b/eightshift-forms.php
index a0f5ff8e..59fb6bb3 100644
--- a/eightshift-forms.php
+++ b/eightshift-forms.php
@@ -6,7 +6,7 @@
  * Description: Eightshift form builder plugin.
  * Author: Team Eightshift
  * Author URI: https://eightshift.com/
- * Version: 2.3.6
+ * Version: 2.3.7
  * Text Domain: eightshift-forms
  *
  * @package EightshiftForms
diff --git a/src/Helpers/Helper.php b/src/Helpers/Helper.php
index dd29a8a5..ad9b9bd2 100644
--- a/src/Helpers/Helper.php
+++ b/src/Helpers/Helper.php
@@ -142,7 +142,7 @@ public static function getFormEditPageUrl(string $formId): string
 	 */
 	public static function getFormTrashActionUrl(string $formId, bool $permanent = false): string
 	{
-		return \get_delete_post_link((int) $formId, '', $permanent);
+		return \get_delete_post_link((int) $formId, '', $permanent) ?? '';
 	}
 
 	/**
diff --git a/src/Integrations/Hubspot/Hubspot.php b/src/Integrations/Hubspot/Hubspot.php
index bfdcd04a..57e4ee3e 100644
--- a/src/Integrations/Hubspot/Hubspot.php
+++ b/src/Integrations/Hubspot/Hubspot.php
@@ -252,6 +252,7 @@ private function getFields(array $data, string $formId, bool $ssr): array
 						$output[] = $item;
 						break;
 					case 'number':
+					case 'phonenumber':
 						$item = [
 							'component' => 'input',
 							'inputFieldHidden' => $hidden,
diff --git a/src/Integrations/Workable/WorkableClient.php b/src/Integrations/Workable/WorkableClient.php
index ccc9ace2..dfad4801 100644
--- a/src/Integrations/Workable/WorkableClient.php
+++ b/src/Integrations/Workable/WorkableClient.php
@@ -310,6 +310,20 @@ private function prepareParams(array $params): array
 				}
 			}
 
+			if ($key === 'es-form-storage') {
+				$domain = '';
+				if (isset($param['value']['utm_source'])) {
+					$domain .= \ucfirst($param['value']['utm_source']);
+				}
+				if (isset($param['value']['utm_medium'])) {
+					$domain .= '(' . \ucfirst($param['value']['utm_medium']) . ')';
+				}
+
+				if ($domain) {
+					$output['domain'] = $domain;
+				}
+			}
+
 			// Remove unecesery fields.
 			if (isset($customFields[$key])) {
 				continue;