diff --git a/.idea/formula-evaluator.iml b/.idea/formula-evaluator.iml
index 5bcabc71..b25edf75 100644
--- a/.idea/formula-evaluator.iml
+++ b/.idea/formula-evaluator.iml
@@ -8,7 +8,7 @@
         <option name="defaultSourceRootUrl" value="file://$MODULE_DIR$/force-app" />
         <option name="moduleContents">
           <ModuleContents>
-            <option name="contentSelectionType" value="SELECTED" />
+            <option name="contentSelectionType" value="LOCAL_FILES" />
           </ModuleContents>
         </option>
       </configuration>
diff --git a/.idea/jsLibraryMappings.xml b/.idea/jsLibraryMappings.xml
deleted file mode 100644
index cc3da93f..00000000
--- a/.idea/jsLibraryMappings.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="JavaScriptLibraryMappings">
-    <file url="file://$PROJECT_DIR$" libraries="{Node.js Core}" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/expression-components/main/ui/components/base/lwc/baseButton/baseButton.js b/expression-components/main/ui/components/base/lwc/baseButton/baseButton.js
index 759ca8e1..9e435a60 100644
--- a/expression-components/main/ui/components/base/lwc/baseButton/baseButton.js
+++ b/expression-components/main/ui/components/base/lwc/baseButton/baseButton.js
@@ -1,6 +1,7 @@
 import {api} from 'lwc';
 import TwElement from "c/twElement";
 import {NavigationMixin} from "lightning/navigation";
+import {RefreshEvent} from "lightning/refresh";
 import execute from '@salesforce/apex/FormulaEvaluatorUiController.execute';
 import {classNames} from 'c/utils';
 
@@ -13,7 +14,7 @@ export default class BaseButton extends NavigationMixin(TwElement) {
 
   /**
    * @typedef ApexFunctionCallback
-   * @property { "navigate__namedPage" | "navigate__url" } type
+   * @property { "navigate__namedPage" | "navigate__url", "reload", "refresh" } type
    * @property { string } name
    * @property { Object } args
    */
@@ -21,7 +22,7 @@ export default class BaseButton extends NavigationMixin(TwElement) {
   /**
    * The action to execute when the button is clicked
    * @property {string} label
-   * @property {"action" | "navigation_namedPage" | "navigation_url" } type
+   * @property {"action", "submit" | "navigation_namedPage" | "navigation_url" } type
    * @property {string | ApexFunction} src
    * @property {ApexFunctionCallback} callback
    */
@@ -32,6 +33,7 @@ export default class BaseButton extends NavigationMixin(TwElement) {
   @api variant = "primary";
 
   disabled = false;
+
   get btnClasses() {
     switch (this.variant) {
       case "primary":
@@ -62,7 +64,12 @@ export default class BaseButton extends NavigationMixin(TwElement) {
       const evt = new CustomEvent('submit',
         {
           bubbles: true,
-          detail: {action: execute, fnReference: this.action.src, callback: this.actionCallback},
+          detail: {
+            action: execute, fnReference: this.action.src, callback: () => {
+              this.actionCallback();
+              this.disabled = false;
+            }
+          },
           composed: true
         });
       this.dispatchEvent(evt);
@@ -70,6 +77,7 @@ export default class BaseButton extends NavigationMixin(TwElement) {
       try {
         const result = await execute({fnReference: this.action.src});
         this.actionCallback(result);
+        this.disabled = false;
       } catch (e) {
         console.error(e);
       }
@@ -99,16 +107,28 @@ export default class BaseButton extends NavigationMixin(TwElement) {
   get displayAsButton() {
     return this.action.type === "submit" || this.action.type === "action";
   }
+
   actionCallback = (result) => {
-    if (this.action.callback.type === 'reload') {
-      // Reload is not handled by the navigation mixin, so we handle it here
-      // as a special case.
-      location.reload();
-    } else {
-      this[NavigationMixin.Navigate](this._getNavigationObjectFromActionResult(result));
+    switch (this.action.callback.type) {
+      case "reload":
+        this.dispatchEvent(new RefreshEvent());
+        break;
+      case "refresh":
+        this.dispatchEvent(new CustomEvent('expression_refresh', {bubbles: true, composed: true}));
+        break;
+      case "navigate__namedPage":
+      case "navigate__url":
+        this._navigate(result);
+        break;
+      default:
+        throw new Error(`Unknown callback type: ${this.action.callback.type}`);
     }
   }
 
+  _navigate(result) {
+    this[NavigationMixin.Navigate](this._getNavigationObjectFromActionResult(result));
+  }
+
   _getNavigationObjectFromActionResult = (result) => {
     return {
       type: this._mapApexCallbackToNavigationMixinType(this.action.callback.type),
diff --git a/expression-components/main/ui/components/base/lwc/expressionElementContainer/expressionElementContainer.html b/expression-components/main/ui/components/base/lwc/expressionElementContainer/expressionElementContainer.html
index 83d2a0e4..abda2eea 100644
--- a/expression-components/main/ui/components/base/lwc/expressionElementContainer/expressionElementContainer.html
+++ b/expression-components/main/ui/components/base/lwc/expressionElementContainer/expressionElementContainer.html
@@ -1,5 +1,5 @@
 <template>
-    <template lwc:if={loading}>
+    <template lwc:if={showLoading}>
         <div class="animate-pulse flex space-x-4 h-20">
             <div class="flex-1 space-y-6 py-1">
                 <div class="bg-slate-200 rounded h-full"></div>
diff --git a/expression-components/main/ui/components/base/lwc/expressionElementContainer/expressionElementContainer.js b/expression-components/main/ui/components/base/lwc/expressionElementContainer/expressionElementContainer.js
index 1a0be363..43a6bd78 100644
--- a/expression-components/main/ui/components/base/lwc/expressionElementContainer/expressionElementContainer.js
+++ b/expression-components/main/ui/components/base/lwc/expressionElementContainer/expressionElementContainer.js
@@ -4,4 +4,8 @@ export default class ExpressionElementContainer extends LightningElement {
   @api cannotShowPreview = false;
   @api error = null;
   @api loading = false;
+
+  get showLoading() {
+    return this.loading && !this.cannotShowPreview;
+  }
 }
diff --git a/expression-components/main/ui/components/base/lwc/expressionSiteElement/expressionSiteElement.js b/expression-components/main/ui/components/base/lwc/expressionSiteElement/expressionSiteElement.js
index 065b851e..1c0924d5 100644
--- a/expression-components/main/ui/components/base/lwc/expressionSiteElement/expressionSiteElement.js
+++ b/expression-components/main/ui/components/base/lwc/expressionSiteElement/expressionSiteElement.js
@@ -1,7 +1,8 @@
 import TwElement from "c/twElement";
+import {refreshApex} from '@salesforce/apex';
 import evaluate from '@salesforce/apex/FormulaEvaluatorUiController.evaluate';
-import { CurrentPageReference } from "lightning/navigation";
-import { wire } from "lwc";
+import {CurrentPageReference} from "lightning/navigation";
+import {wire} from "lwc";
 
 export default class ExpressionSiteElement extends TwElement {
   // These 4 need to be set by the extending class as `@api` properties.
@@ -14,6 +15,15 @@ export default class ExpressionSiteElement extends TwElement {
   computed;
   error;
   contextId = null
+  evaluatedWire;
+
+  connectedCallback() {
+    window.addEventListener('expression_refresh', this.refreshHandler);
+  }
+
+  disconnectedCallback() {
+    window.removeEventListener('expression_refresh', this.refreshHandler);
+  }
 
   @wire(CurrentPageReference)
   setCurrentPageReference(currentPageReference) {
@@ -24,7 +34,9 @@ export default class ExpressionSiteElement extends TwElement {
   }
 
   @wire(evaluate, {recordId: '$contextId', formula: '$expr', respectSharing: '$respectSharing'})
-  evaluate({error, data}) {
+  evaluate(evaluatedWire) {
+    this.evaluatedWire = evaluatedWire;
+    const {error, data} = evaluatedWire;
     if (error) {
       console.error(error);
       this.error = error.body.message;
@@ -34,6 +46,10 @@ export default class ExpressionSiteElement extends TwElement {
     }
   }
 
+  refreshHandler = () => {
+    return refreshApex(this.evaluatedWire);
+  }
+
   get loading() {
     return !this.computed && !this.error;
   }
@@ -64,5 +80,6 @@ export default class ExpressionSiteElement extends TwElement {
     return false;
   }
 
-  validate() {}
+  validate() {
+  }
 }
diff --git a/expression-src/main/api/tests/CollectionFunctionsTest.cls b/expression-src/main/api/tests/CollectionFunctionsTest.cls
index 7d702137..5256282f 100644
--- a/expression-src/main/api/tests/CollectionFunctionsTest.cls
+++ b/expression-src/main/api/tests/CollectionFunctionsTest.cls
@@ -359,6 +359,21 @@ private class CollectionFunctionsTest {
         Assert.areEqual('Child2', result[0]);
     }
 
+    @IsTest
+    private static void combiningWhereAndMap_withRelationshipsBetweenDifferentSObjectTypes() {
+        Account parentAccount = new Account(Name = 'Parent');
+        insert parentAccount;
+
+        Contact childContact = new Contact(LastName = 'Child', AccountId = parentAccount.Id);
+        insert childContact;
+
+        String expr = 'MAP(WHERE(Contacts, BEGINS(LastName, "C")), Name)';
+        List<Object> result = (List<Object>) Evaluator.run(expr, parentAccount.Id);
+
+        Assert.areEqual(1, result.size());
+        Assert.areEqual('Child', result[0]);
+    }
+
     @IsTest
     private static void nestingWheres() {
         Account parentAccount = new Account(Name = 'Parent');
diff --git a/expression-src/main/src/helpers/tests/AstPrinterTest.cls b/expression-src/main/src/helpers/tests/AstPrinterTest.cls
new file mode 100644
index 00000000..1d0199e4
--- /dev/null
+++ b/expression-src/main/src/helpers/tests/AstPrinterTest.cls
@@ -0,0 +1,6 @@
+@IsTest
+private class AstPrinterTest {
+    @IsTest
+    static void testBehavior() {
+    }
+}
\ No newline at end of file
diff --git a/expression-src/main/src/helpers/tests/AstPrinterTest.cls-meta.xml b/expression-src/main/src/helpers/tests/AstPrinterTest.cls-meta.xml
new file mode 100644
index 00000000..7a518297
--- /dev/null
+++ b/expression-src/main/src/helpers/tests/AstPrinterTest.cls-meta.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
+    <apiVersion>58.0</apiVersion>
+    <status>Active</status>
+</ApexClass>
diff --git a/expression-src/main/src/interpreter/ActionVariableResolver.cls b/expression-src/main/src/interpreter/ActionVariableResolver.cls
index 38dbe124..45e6764e 100644
--- a/expression-src/main/src/interpreter/ActionVariableResolver.cls
+++ b/expression-src/main/src/interpreter/ActionVariableResolver.cls
@@ -52,6 +52,11 @@ public with sharing class ActionVariableResolver implements IGlobalVariableResol
                         'type' => 'reload'
                     };
                 }
+                when 'refresh' {
+                    return new Map<String, Object> {
+                        'type' => 'refresh'
+                    };
+                }
                 when else {
                     throw new ActionVariableResolverException('Unknown LWC action: ' + referenceName);
                 }
diff --git a/expression-src/main/src/interpreter/ContextResolver.cls b/expression-src/main/src/interpreter/ContextResolver.cls
index 0cd1cb17..536f8c54 100644
--- a/expression-src/main/src/interpreter/ContextResolver.cls
+++ b/expression-src/main/src/interpreter/ContextResolver.cls
@@ -189,13 +189,14 @@ public with sharing class ContextResolver implements Visitor {
         return null;
     }
 
-    private Set<String> cachedFields;
+    private final Map<SObjectType, Set<String>> cachedFieldsBySObjectType = new Map<SObjectType, Set<String>>();
     private Set<String> getFields() {
-        if (cachedFields == null) {
-            cachedFields = new Set<String>();
-            cachedFields = this.queryContext.objectType.getDescribe().fields.getMap().keySet();
+        if (cachedFieldsBySObjectType.containsKey(this.queryContext.objectType)) {
+            return cachedFieldsBySObjectType.get(this.queryContext.objectType);
         }
 
+        Set<String> cachedFields = this.queryContext.objectType.getDescribe().fields.getMap().keySet();
+        cachedFieldsBySObjectType.put(this.queryContext.objectType, cachedFields);
         return cachedFields;
     }