diff --git a/CHANGELOG.md b/CHANGELOG.md
index cfa5d412..68942b16 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+### Added
+
+- `toAutoLookupElement` to `typeCastService.formElements`
+
 ## [3.1.0] - 2023-06-23
 
 ### Added
diff --git a/package-lock.json b/package-lock.json
index b3422914..ca1c4b64 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1686,7 +1686,7 @@
     },
     "node_modules/@oneblink/types": {
       "version": "1.0.0",
-      "resolved": "git+ssh://git@github.com/oneblink/types.git#3175bc85d6f286e5120eb6824c0076e61b80d646",
+      "resolved": "git+ssh://git@github.com/oneblink/types.git#932f4a8d25253d7a31e8fc4608a3f36d0d9d23b4",
       "dev": true,
       "license": "GPL-3.0-only",
       "engines": {
@@ -12958,7 +12958,7 @@
       }
     },
     "@oneblink/types": {
-      "version": "git+ssh://git@github.com/oneblink/types.git#3175bc85d6f286e5120eb6824c0076e61b80d646",
+      "version": "git+ssh://git@github.com/oneblink/types.git#932f4a8d25253d7a31e8fc4608a3f36d0d9d23b4",
       "dev": true,
       "from": "@oneblink/types@github:oneblink/types"
     },
diff --git a/src/typeCastService.ts b/src/typeCastService.ts
index 74b6dd21..a980f2ed 100644
--- a/src/typeCastService.ts
+++ b/src/typeCastService.ts
@@ -184,6 +184,25 @@ const toStorageElement = (
   }
 }
 
+const toAutoLookupElement = (e: FormTypes.FormElement) => {
+  switch (e.type) {
+    case 'radio':
+    case 'boolean':
+    case 'files':
+    case 'location':
+    case 'geoscapeAddress':
+    case 'pointAddress':
+    case 'compliance':
+    case 'civicaStreetName':
+    case 'autocomplete': {
+      return e
+    }
+    default: {
+      return
+    }
+  }
+}
+
 const formElements = {
   toOptionsElement,
   toFormElementWithForm,
@@ -196,6 +215,7 @@ const formElements = {
   toPageElement,
   toRepeatableSetElement,
   toStorageElement,
+  toAutoLookupElement,
 }
 
 const toPaymentSubmissionEvent = (