diff --git a/nonprofit/index.html b/nonprofit/index.html
index cf91a2822..451543b92 100644
--- a/nonprofit/index.html
+++ b/nonprofit/index.html
@@ -114,7 +114,7 @@ <h3 class="mt-0 text-sm opacity-75 font-medium mb-0">Total Taxpayer Dollars</h3>
   <table id="nonprofitTable" class="">
     <thead>
       <tr>
-        <th data-field="ein">EIN</th>
+        <th class="w-[110px]" data-field="ein">EIN</th>
         <th data-field="name">501(c)(3) Name</th>
         <th data-field="contribTotal">Contributions Total</th>
         <th data-field="govtGrants">Government Grants</th>
@@ -282,8 +282,10 @@ <h3 class="mt-0 text-sm opacity-75 font-medium mb-0">Total Taxpayer Dollars</h3>
         rowsToRender.forEach(item => {
           const tr = $('<tr></tr>');
 
+          // Show the EIN with the standard "XX-XXXXXXX" format
+          const maskedEin = item.ein.substring(0, 2) + '-' + item.ein.substring(2);
           const officerLink = `<a href="../officers?nonprofit_kw=${item.ein}"">Principal Officers</a>`;
-          const proPublicaLink = `<a href="https://projects.propublica.org/nonprofits/organizations/${item.ein}/${item.xmlFileName}/full">${item.ein}</a><br/><span style="font-size: small">${officerLink}</span>`
+          const proPublicaLink = `<a href="https://projects.propublica.org/nonprofits/organizations/${item.ein}/${item.xmlFileName}/full">${maskedEin}</a><br/><span style="font-size: small">${officerLink}</span>`
 
           tr.append($('<td></td>').html(proPublicaLink));
           tr.append($('<td></td>').text(item.name));
@@ -311,7 +313,7 @@ <h3 class="mt-0 text-sm opacity-75 font-medium mb-0">Total Taxpayer Dollars</h3>
 
   // Applies the current filter and the current sort, then renders
   function applyFilterAndSort() {
-    const filterQuery = $('#filterInput').val();
+    const filterQuery = $('#filterInput').val().trim().replace(/[-\s]/g, '');
     let filtered = filterData(nonprofitData, filterQuery);
 
     if (currentSortField) {