diff --git a/.github/workflows/build-and-deploy.yml b/.github/workflows/build-and-deploy.yml
index bacdecc..de523ce 100644
--- a/.github/workflows/build-and-deploy.yml
+++ b/.github/workflows/build-and-deploy.yml
@@ -6,6 +6,8 @@ permissions:
 on:
   push:
     branches: [main]
+  pull_request:
+    branches: [main]
 
 jobs:
   build:
@@ -19,14 +21,20 @@ jobs:
           node-version: 20
           cache: npm
 
+      - name: Install dependencies
+        run: npm ci --legacy-peer-deps
+
+      - name: Run lint
+        run: npm run lint
+
       - name: Build
         run: |
-          npm ci --legacy-peer-deps
           npm run build
           mkdir -p out
           touch out/.nojekyll
 
       - name: Deploy
+        if: github.event_name == 'push' && github.ref == 'refs/heads/main' || github.event_name == 'pull_request' && github.event.pull_request.merged == true
         uses: JamesIves/github-pages-deploy-action@v4
         with:
           branch: gh-pages
diff --git a/src/lib/data-keys.json b/src/lib/data-keys.json
index 1dbf96e..7a7f4bd 100644
--- a/src/lib/data-keys.json
+++ b/src/lib/data-keys.json
@@ -4,15 +4,18 @@
         "mtla_a_delegate",
         "mtla_c_delegate",
         "mtl_delegate",
-        "delegate"
+        "delegate",
+        "owner"
     ],
     "links": [
         "link",
         "link \\d+",
-        "link_\\d+"
+        "link_\\d+",
+        "website"
     ],
     "names": [
         "name",
-        "about"
+        "about",
+        "MTLA:PIIStandard"
     ]
 }