diff --git a/force-app/main/default/lwc/stickySelectronDataCell/stickySelectronDataCell.js b/force-app/main/default/lwc/stickySelectronDataCell/stickySelectronDataCell.js
index 9c09b54..fc97ce5 100644
--- a/force-app/main/default/lwc/stickySelectronDataCell/stickySelectronDataCell.js
+++ b/force-app/main/default/lwc/stickySelectronDataCell/stickySelectronDataCell.js
@@ -25,10 +25,20 @@ function formatDateTimeLocale(dateStr, hasDate, hasTime) {
         timeZone: TIMEZONE
     };
     if (hasDate) {
-        options.dateStyle = 'medium';
+        // Note that setting to short will have a 2-digit year, but we want 4 digit
+        //options.dateStyle = 'short';
+
+        options.year = 'numeric';
+        options.month = '2-digit';
+        options.day = '2-digit';
     }
+    // If we leave default formatting (not setting date and time options) then time is not shown
     if (hasTime) {
-        options.timeStyle = 'short';
+        // timeStyle short is the format we want, but since we need a 4 digit year, we need to set the time components manually
+        //options.timeStyle = 'short';
+
+        options.hour = '2-digit';
+        options.minute = '2-digit';
     }
     return new Intl.DateTimeFormat(LOCALE, options).format(new Date(dateStr));
 }
@@ -70,7 +80,13 @@ export default class StickySelectronDataCell extends LightningElement {
 
     get fieldValForObject() {
         const inputVal = this.object?.[this.fieldName];
-        if (inputVal) {
+        // We may get a zero value from Apex that should still be rendered with our JS formatting
+        if (
+            inputVal ||
+            this.sfType === 'CURRENCY' ||
+            this.sfType === 'PERCENT' ||
+            this.sfType === 'DOUBLE'
+        ) {
             if (this.sfType === 'DATETIME') {
                 const hasDate = true;
                 const hasTime = true;
diff --git a/force-app/main/default/lwc/stickySelectronMain/stickySelectronMain.html b/force-app/main/default/lwc/stickySelectronMain/stickySelectronMain.html
index a4a8ba0..f0f4683 100644
--- a/force-app/main/default/lwc/stickySelectronMain/stickySelectronMain.html
+++ b/force-app/main/default/lwc/stickySelectronMain/stickySelectronMain.html
@@ -58,7 +58,7 @@
                     class="slds-float_left slds-var-m-top_xx-small slds-var-p-around_x-small slds-scrollable_y grid-main"
                 >
                     <!-- Spinner -->
-                    <template if:true={isLoading}>
+                    <template if:true={stillShowLoading}>
                         <div class="slds-var-p-around_x-large spinner">
                             <lightning-spinner
                                 alternative-text="Loading"
diff --git a/force-app/main/default/lwc/stickySelectronMain/stickySelectronMain.js b/force-app/main/default/lwc/stickySelectronMain/stickySelectronMain.js
index 5a9e5d8..ef8aea7 100644
--- a/force-app/main/default/lwc/stickySelectronMain/stickySelectronMain.js
+++ b/force-app/main/default/lwc/stickySelectronMain/stickySelectronMain.js
@@ -36,6 +36,27 @@ export default class StickySelectronMain extends LightningElement {
     @api initialListCount;
     isLoading = false;
 
+    // We want to continue showing the loading icon if our LWC hasn't rendered yet,
+    // if the input list is empty, or if the input table field metadata hasn't finished yet
+    // Also we have to detect if the input list is empty because someone searched and there are no hits
+    // Note that we compare the inputTableFieldNames length to the fieldsOnLeft length - 1 because of the Select column that is in the fieldsOnLeft but
+    // not in the inputTableFieldNames
+    get stillShowLoading() {
+        const shouldShowLoading =
+            this.isLoading ||
+            this.workingInputObjList.length === 0 ||
+            this.inputTableFieldNames.length !== this.fieldsOnLeft.length - 1;
+        if (shouldShowLoading) {
+            const inp = this.template.querySelector('lightning-input');
+            const searchKey = inp?.value;
+            // If there is a search key set, we should not show the loading icon
+            if (searchKey && this.workingInputObjList.length === 0) {
+                return false;
+            }
+        }
+        return shouldShowLoading;
+    }
+
     @api inputTableFieldNames;
     @api selectedTableFieldNames;
 
@@ -343,8 +364,15 @@ export default class StickySelectronMain extends LightningElement {
                                     recs.push(rec);
                                     break;
                                 }
+                                // Added logic to replace %, /, and $ from search key because
+                                // we are searching just the values from Salesforce (not the HTML displayed)
                             } else if (typeof val === 'number') {
-                                if (val.toString().includes(searchKey)) {
+                                const searchKeyToCheck = searchKey
+                                    .replaceAll('%', '')
+                                    .replaceAll('/', '')
+                                    .replaceAll('$', '')
+                                    .replaceAll(',', '');
+                                if (val.toString().includes(searchKeyToCheck)) {
                                     recs.push(rec);
                                     break;
                                 }
diff --git a/unpackaged/config/dev/flows/Sticky_Selectron_Example_Accounts_Flow.flow-meta.xml b/unpackaged/config/dev/flows/Sticky_Selectron_Example_Accounts_Flow.flow-meta.xml
index d18e248..28a1010 100644
--- a/unpackaged/config/dev/flows/Sticky_Selectron_Example_Accounts_Flow.flow-meta.xml
+++ b/unpackaged/config/dev/flows/Sticky_Selectron_Example_Accounts_Flow.flow-meta.xml
@@ -123,7 +123,6 @@
         <queriedFields>ssCurrency__c</queriedFields>
         <queriedFields>ssDateTime__c</queriedFields>
         <queriedFields>AnnualRevenue</queriedFields>
-        <queriedFields>NewCurrency__c</queriedFields>
         <queriedFields>CreatedDate</queriedFields>
     </recordLookups>
     <screens>
diff --git a/unpackaged/config/dev/layouts/Account-Account %28Marketing%29 Layout.layout-meta.xml b/unpackaged/config/dev/layouts/Account-Account %28Marketing%29 Layout.layout-meta.xml
index e21c12f..51ce877 100644
--- a/unpackaged/config/dev/layouts/Account-Account %28Marketing%29 Layout.layout-meta.xml	
+++ b/unpackaged/config/dev/layouts/Account-Account %28Marketing%29 Layout.layout-meta.xml	
@@ -31,7 +31,7 @@
             </layoutItems>
             <layoutItems>
                 <behavior>Edit</behavior>
-                <field>NewCurrency__c</field>
+                <field>ssCurrency__c</field>
             </layoutItems>
             <layoutItems>
                 <behavior>Edit</behavior>
@@ -41,6 +41,10 @@
                 <behavior>Edit</behavior>
                 <field>ssDate__c</field>
             </layoutItems>
+            <layoutItems>
+                <behavior>Edit</behavior>
+                <field>ssDateTime__c</field>
+            </layoutItems>
             <layoutItems>
                 <behavior>Edit</behavior>
                 <field>ssTime__c</field>
diff --git a/unpackaged/config/dev/layouts/Account-Account %28Sales%29 Layout.layout-meta.xml b/unpackaged/config/dev/layouts/Account-Account %28Sales%29 Layout.layout-meta.xml
index 1613672..5a04a77 100644
--- a/unpackaged/config/dev/layouts/Account-Account %28Sales%29 Layout.layout-meta.xml	
+++ b/unpackaged/config/dev/layouts/Account-Account %28Sales%29 Layout.layout-meta.xml	
@@ -45,10 +45,6 @@
                 <behavior>Edit</behavior>
                 <field>NumberOfEmployees</field>
             </layoutItems>
-            <layoutItems>
-                <behavior>Edit</behavior>
-                <field>NewCurrency__c</field>
-            </layoutItems>
             <layoutItems>
                 <behavior>Edit</behavior>
                 <field>ssDouble__c</field>
diff --git a/unpackaged/config/dev/layouts/Account-Account %28Support%29 Layout.layout-meta.xml b/unpackaged/config/dev/layouts/Account-Account %28Support%29 Layout.layout-meta.xml
index b4ea746..3a48bf7 100644
--- a/unpackaged/config/dev/layouts/Account-Account %28Support%29 Layout.layout-meta.xml	
+++ b/unpackaged/config/dev/layouts/Account-Account %28Support%29 Layout.layout-meta.xml	
@@ -43,7 +43,7 @@
             </layoutItems>
             <layoutItems>
                 <behavior>Edit</behavior>
-                <field>NewCurrency__c</field>
+                <field>ssCurrency__c</field>
             </layoutItems>
             <layoutItems>
                 <behavior>Edit</behavior>
@@ -53,6 +53,10 @@
                 <behavior>Edit</behavior>
                 <field>ssDate__c</field>
             </layoutItems>
+            <layoutItems>
+                <behavior>Edit</behavior>
+                <field>ssDateTime__c</field>
+            </layoutItems>
             <layoutItems>
                 <behavior>Edit</behavior>
                 <field>ssTime__c</field>
diff --git a/unpackaged/config/dev/layouts/Account-Account Layout.layout-meta.xml b/unpackaged/config/dev/layouts/Account-Account Layout.layout-meta.xml
index b1a282b..2e5e1d0 100644
--- a/unpackaged/config/dev/layouts/Account-Account Layout.layout-meta.xml	
+++ b/unpackaged/config/dev/layouts/Account-Account Layout.layout-meta.xml	
@@ -41,10 +41,6 @@
                 <behavior>Edit</behavior>
                 <field>AnnualRevenue</field>
             </layoutItems>
-            <layoutItems>
-                <behavior>Edit</behavior>
-                <field>NewCurrency__c</field>
-            </layoutItems>
             <layoutItems>
                 <behavior>Edit</behavior>
                 <field>ssDouble__c</field>
diff --git a/unpackaged/config/dev/objects/Account/fields/ssDateTime__c.field-meta.xml b/unpackaged/config/dev/objects/Account/fields/ssDateTime__c.field-meta.xml
new file mode 100644
index 0000000..96eae06
--- /dev/null
+++ b/unpackaged/config/dev/objects/Account/fields/ssDateTime__c.field-meta.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+    <fullName>ssDateTime__c</fullName>
+    <description>Help field for sticky selectron dev</description>
+    <label>ssDateTime</label>
+    <required>false</required>
+    <trackFeedHistory>false</trackFeedHistory>
+    <type>DateTime</type>
+</CustomField>