diff --git a/peachjam/js/components/FindDocuments/AdvancedSearch.vue b/peachjam/js/components/FindDocuments/AdvancedSearch.vue
index 67c7ead72..ccf66c066 100644
--- a/peachjam/js/components/FindDocuments/AdvancedSearch.vue
+++ b/peachjam/js/components/FindDocuments/AdvancedSearch.vue
@@ -1,74 +1,54 @@
 <template>
   <form @submit.prevent="submitAdvancedForm">
-    <div class="row mt-5">
-      <div class="col-12">
-        <div class="card mb-3">
-          <h5 class="card-header">
-            {{ $t("Search documents") }}
-          </h5>
-          <div class="card-body">
-            <AdvancedSearchFields
-              v-for="(criterion, index) in modelValue"
-              :key="index"
-              :criterion="criterion"
-              :target-index="index"
-              @on-change="onChange"
-              @on-logic-change="onLogicChange"
-              @on-exact-change="onExactChange"
-            />
+    <div class="card">
+      <div class="card-body">
+        <AdvancedSearchFields
+          v-for="(criterion, index) in modelValue"
+          :key="index"
+          :criterion="criterion"
+          :target-index="index"
+          @on-change="onChange"
+        />
+
+        <div class="row mt-5">
+          <div class="col-6">
+            <label class="form-label" for="date_from">{{
+              $t("Date from")
+            }}</label>
+            <input
+              id="date_from"
+              name="date_from"
+              type="date"
+              class="form-control"
+              :aria-describedby="$t('Date from')"
+              :placeholder="$t('Enter start date')"
+              :value="advancedSearchDateCriteria.date_from"
+              :disabled="disableDate"
+              @change="onDateChange"
+            >
           </div>
-        </div>
-      </div>
-
-      <div class="col-lg">
-        <div class="card mb-3">
-          <h5 class="card-header">
-            {{ $t("Date") }}
-          </h5>
-          <div class="card-body">
-            <div class="row">
-              <div class="col-6">
-                <label class="form-label" for="date_from">{{
-                  $t("Date from")
-                }}</label>
-                <input
-                  id="date_from"
-                  name="date_from"
-                  type="date"
-                  class="form-control"
-                  :aria-describedby="$t('Date from')"
-                  :placeholder="$t('Enter start date')"
-                  :value="advancedSearchDateCriteria.date_from"
-                  :disabled="disableDate"
-                  @change="onDateChange"
-                >
-              </div>
-              <div class="col-6">
-                <label class="form-label" for="date_to">{{
-                  $t("Date to")
-                }}</label>
-                <input
-                  id="date_to"
-                  name="date_to"
-                  type="date"
-                  class="form-control"
-                  :aria-describedby="$t('Date to')"
-                  :placeholder="$t('Enter end date')"
-                  :value="advancedSearchDateCriteria.date_to"
-                  :disabled="disableDate"
-                  @change="onDateChange"
-                >
-              </div>
-            </div>
-            <div v-if="invalidDates" class="text-danger">
-              {{ $t("The date range is invalid") }}.
-            </div>
+          <div class="col-6">
+            <label class="form-label" for="date_to">{{
+              $t("Date to")
+            }}</label>
+            <input
+              id="date_to"
+              name="date_to"
+              type="date"
+              class="form-control"
+              :aria-describedby="$t('Date to')"
+              :placeholder="$t('Enter end date')"
+              :value="advancedSearchDateCriteria.date_to"
+              :disabled="disableDate"
+              @change="onDateChange"
+            >
           </div>
         </div>
+        <div v-if="invalidDates" class="text-danger">
+          {{ $t("The date range is invalid") }}.
+        </div>
       </div>
-    </div>
-    <div class="d-flex justify-content-end">
-      <div>
+      <div class="card-footer d-flex justify-content-end">
         <HelpBtn page="search/advanced-search" />
         <button type="submit" class="btn btn-primary">
           {{ $t('Search') }}
@@ -149,34 +129,8 @@ export default {
   },
 
   methods: {
-    onChange (e, index = 0) {
-      const data = [...this.modelValue];
-
-      if (e.target.type === 'checkbox') {
-        if (e.target.checked) data[index].fields.push(e.target.value);
-      } else {
-        data[index] = { ...data[index], text: e.target.value };
-
-        if (index && index === data.length - 1 && e.target.value) {
-          data.push({
-            text: '',
-            fields: [],
-            condition: 'AND',
-            exact: false
-          });
-        }
-
-        if (index === 0) this.$emit('global-search-change', e.target.value);
-      }
-
-      this.$emit('update:modelValue', data);
-    },
-
-    onExactChange (e, index) {
-      const data = [...this.modelValue];
-      data[index] = { ...data[index], exact: e.target.checked };
-
-      this.$emit('update:modelValue', data);
+    onChange () {
+      this.cleanupCriteria(false);
     },
 
     onDateChange (e) {
@@ -186,14 +140,24 @@ export default {
       });
     },
 
-    onLogicChange (logicName, index) {
-      const data = [...this.modelValue];
-      data[index] = { ...data[index], condition: logicName };
+    cleanupCriteria (removeEmpty) {
+      let data = [...this.modelValue];
+
+      if (removeEmpty) {
+        data = data.filter((criterion) => criterion.condition === '' || criterion.text);
+      }
+
+      // ensure there's an empty entry at the end
+      if (data[data.length - 1].text) {
+        data.push({ text: '', fields: [], exact: false, condition: 'AND' });
+      }
 
       this.$emit('update:modelValue', data);
     },
 
     submitAdvancedForm () {
+      // remove empty criteria
+      this.cleanupCriteria(true);
       this.$emit('submit');
     }
   }
diff --git a/peachjam/js/components/FindDocuments/AdvancedSearchFields.vue b/peachjam/js/components/FindDocuments/AdvancedSearchFields.vue
index 2dc77b7c9..49699308b 100644
--- a/peachjam/js/components/FindDocuments/AdvancedSearchFields.vue
+++ b/peachjam/js/components/FindDocuments/AdvancedSearchFields.vue
@@ -1,95 +1,84 @@
 <template>
-  <div class="mb-3 row">
-    <div v-if="criterion.condition" class="dropdown col-3">
-      <span
-        :id="`${criterion.condition}_${targetIndex}-dropdown`"
-        class="btn btn-secondary dropdown-toggle"
-        href="#"
-        role="button"
-        data-bs-toggle="dropdown"
-        aria-expanded="false"
-      >
-        {{ criterion.condition }} these words
-      </span>
+  <div class="mb-3 d-md-flex">
+    <div class="d-flex mb-2 flex-grow-1">
+      <div v-if="criterion.condition" class="me-3">
+        <select
+          v-model="criterion.condition"
+          class="form-control"
+          @change="changed"
+        >
+          <option value="AND">
+            {{ $t('AND') }}
+          </option>
+          <option value="OR">
+            {{ $t('OR') }}
+          </option>
+          <option value="NOT">
+            {{ $t('NOT') }}
+          </option>
+        </select>
+      </div>
 
-      <div class="dropdown-menu p-2" :aria-labelledby="`${criterion.condition}_${targetIndex}-dropdown`">
-        <button
-          v-for="logicField in logicFields"
-          :key="logicField"
-          class="dropdown-item"
-          type="button"
-          @click="$emit('on-logic-change', logicField, targetIndex)"
+      <div class="flex-grow-1 me-3">
+        <input
+          v-model="criterion.text"
+          type="text"
+          class="form-control"
+          placeholder="Text to search for..."
+          @input="changed"
         >
-          {{ logicField }} these words
-        </button>
       </div>
     </div>
 
-    <div :class="`${criterion.condition ? 'col-9' : 'col-12'}`">
-      <input
-        :id="`${criterion.condition}_${targetIndex}-text`"
-        :value="criterion.text"
-        :name="`${criterion.condition}_${targetIndex}-text`"
-        type="text"
-        class="form-control"
-        @input="(e) => $emit('on-change', e, targetIndex)"
-      >
+    <div class="d-flex mb-2">
+      <div class="dropdown me-3">
+        <button
+          :id="`advanced-${targetIndex}-fields-btn`"
+          class="btn btn-secondary dropdown-toggle"
+          data-bs-toggle="dropdown"
+          data-bs-auto-close="outside"
+          aria-expanded="false"
+        >
+          {{ $t('In these fields') }}
+        </button>
 
-      <div class="d-flex justify-content-between">
-        <div class="dropdown">
-          <span
-            :id="`${criterion.condition}_${targetIndex}-dropdown_fields`"
-            class="dropdown-toggle"
-            href="#"
-            role="button"
-            data-bs-toggle="dropdown"
-            data-bs-auto-close="outside"
-            aria-expanded="false"
+        <div class="dropdown-menu" :aria-labelledby="`advanced-${targetIndex}-fields-btn`">
+          <div
+            v-for="field in fields"
+            :key="field.field"
+            class="form-check dropdown-item"
           >
-            Choose fields
-          </span>
-
-          <div class="dropdown-menu" :aria-labelledby="`${criterion.condition}_${targetIndex}-dropdown_fields`">
-            <div
-              v-for="field in ['title', 'judges', 'case_summary', 'flynote', 'content']"
-              :key="field"
-              class="form-check dropdown-item"
+            <input
+              :id="`advanced-${targetIndex}-fields-${field.field}`"
+              :checked="field.field === 'ANY' && criterion.fields.length === 0 || criterion.fields.indexOf(field.field) > -1"
+              class="form-check-input"
+              type="checkbox"
+              @change="(e) => fieldChanged(field.field, e.target.checked)"
+            >
+            <label
+              class="form-check-label"
+              :for="`advanced-${targetIndex}-fields-${field.field}`"
             >
-              <input
-                :id="`${criterion.condition}_${targetIndex}-${field}`"
-                :checked="criterion.fields.includes(field)"
-                :name="`${criterion.condition}_${targetIndex}-${field}`"
-                :value="field"
-                class="form-check-input"
-                type="checkbox"
-                @change="(e) => $emit('on-change', e)"
-              >
-              <label
-                class="form-check-label"
-                :for="`${criterion.condition}_${targetIndex}-${field}`"
-              >
-                {{ formatName(field) }}
-              </label>
-            </div>
+              {{ field.label }}
+            </label>
           </div>
         </div>
+      </div>
 
-        <div class="form-check">
-          <input
-            :id="`${criterion.condition}_${targetIndex}-exact`"
-            :checked="criterion.exact"
-            :name="`${criterion.condition}_${targetIndex}-exact`"
-            type="checkbox"
-            class="form-check-input"
-            @change="(e) => $emit('on-exact-change', e)"
-          >
-          <label
-            class="form-check-label"
-            :for="`${criterion.condition}_${targetIndex}-exact`"
-          >
-            Exact Phrase
-          </label>
-        </div>
+      <div class="form-check">
+        <input
+          :id="`advanced-${targetIndex}-exact`"
+          v-model="criterion.exact"
+          type="checkbox"
+          class="form-check-input"
+          @change="changed"
+        >
+        <label
+          class="form-check-label"
+          :for="`advanced-${targetIndex}-exact`"
+        >
+          {{ $t('Exact phrase') }}
+        </label>
       </div>
     </div>
   </div>
@@ -99,26 +88,56 @@
 export default {
   name: 'AdvancedSearchFields',
   props: {
-    targetIndex: {
-      type: Number,
-      default: 0
-    },
     criterion: {
       type: Object,
       default: () => ({})
+    },
+    targetIndex: {
+      type: Number,
+      default: 0
     }
   },
-  emits: ['on-change', 'on-logic-change', 'on-exact-change'],
-  computed: {
-    logicFields () {
-      return ['AND', 'OR', 'NOT'].filter(logic => logic !== this.criterion.condition);
-    }
+  emits: ['on-change'],
+  data: (self) => {
+    return {
+      fields: [{
+        field: 'ANY',
+        label: self.$t('Any field')
+      },{
+        field: 'title',
+        label: self.$t('Title')
+      }, {
+        field: 'judges',
+        label: self.$t('Judges')
+      }, {
+        field: 'case_summary',
+        label: self.$t('Case summary')
+      }, {
+        field: 'flynote',
+        label: self.$t('Flynote')
+      }, {
+        field: 'content',
+        label: self.$t('Content')
+      }]
+    };
   },
   methods: {
-    formatName (name) {
-      let splitName = name.split('_');
-      splitName = splitName.map((word) => word.charAt(0).toUpperCase() + word.slice(1));
-      return splitName.join(' ');
+    changed () {
+      this.$emit('on-change');
+    },
+    fieldChanged (field, checked) {
+      if (field === 'ANY') {
+        this.criterion.fields = [];
+      } else {
+        if (checked) {
+          if (!this.criterion.fields.includes(field)) {
+            this.criterion.fields.push(field);
+          }
+        } else {
+          this.criterion.fields = this.criterion.fields.filter((f) => f !== field);
+        }
+      }
+      this.changed();
     }
   }
 };
diff --git a/peachjam/js/components/FindDocuments/index.vue b/peachjam/js/components/FindDocuments/index.vue
index 8fd570f17..d117e0771 100644
--- a/peachjam/js/components/FindDocuments/index.vue
+++ b/peachjam/js/components/FindDocuments/index.vue
@@ -515,7 +515,7 @@ export default {
             text: criterion.text,
             fields: criterion.fields || [],
             condition: criterion.condition || '',
-            exact: criterion.exact === 'true'
+            exact: !!criterion.exact
           };
           if (index === 0 && !criterion.condition) this.advancedSearchCriteria.splice(0, 1, fullCriterion);
           else this.advancedSearchCriteria.splice(index, 0, fullCriterion);
@@ -612,10 +612,7 @@ export default {
       if (this.q || this.advancedSearchCriteria.some(f => f.text)) {
         this.loadingCount = this.loadingCount + 1;
 
-        // ensure the search tab is activated and scroll to put the search box at the top
-        // of the window
-        const searchTab = new window.bootstrap.Tab(this.$el.querySelector('#search-tab'));
-        searchTab.show();
+        // scroll to put the search box at the top of the window
         scrollToElement(this.$refs['search-box']);
 
         try {
diff --git a/peachjam/js/locale/en/translation.json b/peachjam/js/locale/en/translation.json
index 23c4848b7..cb08f6e75 100644
--- a/peachjam/js/locale/en/translation.json
+++ b/peachjam/js/locale/en/translation.json
@@ -2,10 +2,8 @@
   "{document_count} documents found": "{document_count} documents found.",
   "{reverse_verb} this provision": "{reverse_verb} this provision",
   "Advanced search": "Advanced search",
-  "All these words": "All these words",
   "Alphabetical": "Alphabetical",
-  "Any of these words": "Any of these words",
-  "Anywhere": "Anywhere",
+  "AND": "AND",
   "Attorneys": "Attorneys",
   "Author": "Author",
   "Between {prev_expression_date} and {new_expression_date}": "Between {prev_expression_date} and {new_expression_date}",
@@ -14,7 +12,6 @@
   "Clear all": "Clear all",
   "Close": "Close",
   "Collapse all": "Collapse all",
-  "Content": "Content",
   "Court": "Court",
   "Court registry": "Court registry",
   "Date": "Date",
@@ -23,14 +20,19 @@
   "Date from": "Date from",
   "Date to": "Date to",
   "Delete": "Delete",
+  "Document is empty": "Document is empty",
+  "Document is not accessible on my device": "Document is not accessible on my device",
   "Document nature": "Document nature",
   "Document type": "Document type",
   "Edit": "Edit",
   "Enter end date": "Enter end date",
   "Enter start date": "Enter start date",
+  "Exact phrase": "Exact phrase",
   "Expand all": "Expand all",
   "Filters": "Filters",
   "Help": "Help",
+  "In these fields": "In these fields",
+  "Incorrect information": "Incorrect information",
   "Is there something wrong with this document?": "Is there something wrong with this document?",
   "Judges": "Judges",
   "Jurisdiction": "Jurisdiction",
@@ -39,17 +41,22 @@
   "Loading": "Loading",
   "Locality": "Locality",
   "Matter type": "Matter type",
+  "Missing information": "Missing information",
   "More than 10,000 documents found": "More than 10,000 documents found.",
   "Multiple languages available": "Multiple languages available",
   "Nature": "Nature",
   "No documents match your search": "No documents match your search.",
   "No legislation found": "No legislation found.",
+  "No PDF download": "No PDF download",
   "No results": "No results",
-  "None of these words": "None of these words",
+  "NOT": "NOT",
   "Numbered title": "Numbered title",
   "Oops, something went wrong": "Oops, something went wrong.",
+  "OR": "OR",
   "Order": "Order",
+  "Other": "Other",
   "Page": "Page",
+  "Problem category": "Problem category",
   "Regional body": "Regional body",
   "Relevance": "Relevance",
   "Remove": "Remove",
@@ -63,12 +70,12 @@
   "Search table of contents": "Search table of contents",
   "Share": "Share",
   "Show changes side-by-side": "Show changes side-by-side",
+  "Show full text": "Show full text",
   "Something went wrong": "Something went wrong.",
   "Sort by": "Sort by",
   "Taxonomies": "Taxonomies",
   "Thank you for your feedback": "Thank you for your feedback.",
   "The date range is invalid": "The date range is invalid",
-  "This exact word or phrase": "This exact word or phrase",
   "This provision": "This provision",
   "This provision has been amended": "This provision has been amended",
   "Title": "Title",
@@ -78,5 +85,5 @@
   "What's the problem?": "What's the problem?",
   "Year": "Year",
   "Years": "Years",
-  "Your email address (optional)": "Your email address (optional)"
+  "Your email address": "Your email address"
 }
diff --git a/peachjam/js/locale/fr/translation.json b/peachjam/js/locale/fr/translation.json
index 510d5c757..8859ca49c 100644
--- a/peachjam/js/locale/fr/translation.json
+++ b/peachjam/js/locale/fr/translation.json
@@ -2,10 +2,8 @@
   "{document_count} documents found": "{document_count} documents trouvés.",
   "{reverse_verb} this provision": "{reverse_verb} cette disposition",
   "Advanced search": "Recherche avancée",
-  "All these words": "Tous ces mots",
   "Alphabetical": "Alphabétique",
-  "Any of these words": "N'importe lequel de ces mots",
-  "Anywhere": "Partout",
+  "AND": "AND",
   "Attorneys": "Avocats",
   "Author": "Auteur",
   "Between {prev_expression_date} and {new_expression_date}": "Entre {prev_expression_date} et {new_expression_date}",
@@ -14,7 +12,6 @@
   "Clear all": "Effacer tout",
   "Close": "Fermer",
   "Collapse all": "Réduire tout",
-  "Content": "Contenus",
   "Court": "Cour",
   "Court registry": "Registre des tribunaux",
   "Date": "Date",
@@ -23,14 +20,19 @@
   "Date from": "Date du",
   "Date to": "Date de fin",
   "Delete": "Supprimez",
+  "Document is empty": "Document is empty",
+  "Document is not accessible on my device": "Document is not accessible on my device",
   "Document nature": "Type de document",
   "Document type": "Type de document",
   "Edit": "Modifier",
   "Enter end date": "Entrez la date de fin",
   "Enter start date": "Entrez la date de début",
+  "Exact phrase": "Exact phrase",
   "Expand all": "Développer tout",
   "Filters": "Filtres",
   "Help": "Aide",
+  "In these fields": "In these fields",
+  "Incorrect information": "Incorrect information",
   "Is there something wrong with this document?": "Y a-t-il quelque chose qui ne va pas avec ce document ?",
   "Judges": "Juges",
   "Jurisdiction": "Juridiction",
@@ -39,17 +41,22 @@
   "Loading": "En cours de chargement",
   "Locality": "Localité",
   "Matter type": "Type de matière",
+  "Missing information": "Missing information",
   "More than 10,000 documents found": "Plus de 10 000 documents retrouvés.",
   "Multiple languages available": "Plusieurs langues disponibles",
   "Nature": "Nature",
   "No documents match your search": "Aucun document ne correspond à votre recherche.",
   "No legislation found": "Aucune législation trouvée.",
+  "No PDF download": "No PDF download",
   "No results": "Aucun résultat",
-  "None of these words": "Aucun de ces mots",
+  "NOT": "NOT",
   "Numbered title": "Titre numéroté",
   "Oops, something went wrong": "Oups, une erreur s'est produite.",
+  "OR": "OR",
   "Order": "Commande",
+  "Other": "Other",
   "Page": "Page",
+  "Problem category": "Problem category",
   "Regional body": "Corps régional",
   "Relevance": "Pertinence",
   "Remove": "Retirer",
@@ -63,12 +70,12 @@
   "Search table of contents": "Rechercher la table des matières",
   "Share": "Partager",
   "Show changes side-by-side": "Afficher les modifications côte à côte",
+  "Show full text": "Show full text",
   "Something went wrong": "Quelque chose s'est mal passé.",
   "Sort by": "Trier par",
   "Taxonomies": "Taxonomies",
   "Thank you for your feedback": "Merci pour votre avis.",
   "The date range is invalid": "La plage de dates n'est pas valide",
-  "This exact word or phrase": "Cette phrase ou ce mot exact",
   "This provision": "Cette disposition",
   "This provision has been amended": "Cette disposition a été modifiée",
   "Title": "Titre",
@@ -78,5 +85,5 @@
   "What's the problem?": "Quel est le problème?",
   "Year": "Année",
   "Years": "Années",
-  "Your email address (optional)": "Votre adresse email (facultatif)"
+  "Your email address": "Your email address"
 }
diff --git a/peachjam/js/locale/pt/translation.json b/peachjam/js/locale/pt/translation.json
index aaf707761..b6555edd3 100644
--- a/peachjam/js/locale/pt/translation.json
+++ b/peachjam/js/locale/pt/translation.json
@@ -2,10 +2,8 @@
   "{document_count} documents found": "{document_count} documentos encontrados.",
   "{reverse_verb} this provision": "{reverse_verb} esta disposição",
   "Advanced search": "Pesquisa avançada",
-  "All these words": "Todas essas palavras",
   "Alphabetical": "Alfabética",
-  "Any of these words": "Qualquer uma dessas palavras",
-  "Anywhere": "Em qualquer lugar",
+  "AND": "AND",
   "Attorneys": "Advogados",
   "Author": "Autor",
   "Between {prev_expression_date} and {new_expression_date}": "Entre {prev_expression_date} e {new_expression_date}",
@@ -14,7 +12,6 @@
   "Clear all": "Limpar tudo",
   "Close": "FECHAR",
   "Collapse all": "Recolher tudo",
-  "Content": "Conteúdo",
   "Court": "Tribunal",
   "Court registry": "Registro do tribunal",
   "Date": "Data",
@@ -23,14 +20,19 @@
   "Date from": "Data inicial",
   "Date to": "Data final",
   "Delete": "Excluir",
+  "Document is empty": "Document is empty",
+  "Document is not accessible on my device": "Document is not accessible on my device",
   "Document nature": "Natureza do documento",
   "Document type": "Tipo de documento",
   "Edit": "Editar",
   "Enter end date": "Digite a data final",
   "Enter start date": "Digite a data inicial",
+  "Exact phrase": "Exact phrase",
   "Expand all": "Expandir tudo",
   "Filters": "Filtros",
   "Help": "Socorro",
+  "In these fields": "In these fields",
+  "Incorrect information": "Incorrect information",
   "Is there something wrong with this document?": "Há algo errado com este documento?",
   "Judges": "Juízes",
   "Jurisdiction": "Jurisdição",
@@ -39,17 +41,22 @@
   "Loading": "Carregando...",
   "Locality": "Localidade",
   "Matter type": "Tipo de matéria",
+  "Missing information": "Missing information",
   "More than 10,000 documents found": "Mais de 10.000 documentos encontrados.",
   "Multiple languages available": "Vários idiomas disponíveis",
   "Nature": "Natureza",
   "No documents match your search": "Nenhum documento corresponde à sua pesquisa.",
   "No legislation found": "Nenhuma legislação encontrada.",
+  "No PDF download": "No PDF download",
   "No results": "Nenhum resultado",
-  "None of these words": "Nenhuma dessas palavras",
+  "NOT": "NOT",
   "Numbered title": "Título numerado",
   "Oops, something went wrong": "Ops, algo deu errado.",
+  "OR": "OR",
   "Order": "Ordem",
+  "Other": "Other",
   "Page": "Página",
+  "Problem category": "Problem category",
   "Regional body": "Corpo regional",
   "Relevance": "Relevância",
   "Remove": "Remover",
@@ -63,12 +70,12 @@
   "Search table of contents": "Pesquisar na tabela de conteúdos",
   "Share": "Compartilhar",
   "Show changes side-by-side": "Mostrar mudanças lado a lado",
+  "Show full text": "Show full text",
   "Something went wrong": "Algo deu errado.",
   "Sort by": "Classificar por",
   "Taxonomies": "Taxonomies",
   "Thank you for your feedback": "Obrigado pelo seu feedback.",
   "The date range is invalid": "O intervalo de datas é inválido",
-  "This exact word or phrase": "Esta palavra ou frase exata",
   "This provision": "Esta disposição",
   "This provision has been amended": "Esta disposição foi alterada",
   "Title": "Título",
@@ -78,5 +85,5 @@
   "What's the problem?": "Qual é o problema?",
   "Year": "Ano",
   "Years": "anos",
-  "Your email address (optional)": "Seu endereço de e-mail (opcional)"
+  "Your email address": "Your email address"
 }
diff --git a/peachjam/js/locale/sw/translation.json b/peachjam/js/locale/sw/translation.json
index 51124ec96..5e019853b 100644
--- a/peachjam/js/locale/sw/translation.json
+++ b/peachjam/js/locale/sw/translation.json
@@ -2,10 +2,8 @@
   "{document_count} documents found": "Nyaraka {document_count} zilizopatikana.",
   "{reverse_verb} this provision": "{reverse_verb} kifungu hiki",
   "Advanced search": "Utafutaji wa kina",
-  "All these words": "Maneno  yote haya",
   "Alphabetical": "Kufuata alfabeti",
-  "Any of these words": "Lolote kati ya ya maneno haya",
-  "Anywhere": "Popote",
+  "AND": "AND",
   "Attorneys": "Wanasheria",
   "Author": "Mwandishi",
   "Between {prev_expression_date} and {new_expression_date}": "Kati ya {prev_expression_date} na {new_expression_date}",
@@ -14,7 +12,6 @@
   "Clear all": "Futa zote",
   "Close": "Funga",
   "Collapse all": "Kunja zote",
-  "Content": "Maudhui",
   "Court": "Mahakama",
   "Court registry": "Usajili wa mahakama",
   "Date": "Tarehe",
@@ -23,14 +20,19 @@
   "Date from": "Tarehe kutoka",
   "Date to": "Tarehe hadi",
   "Delete": "Futa",
+  "Document is empty": "Document is empty",
+  "Document is not accessible on my device": "Document is not accessible on my device",
   "Document nature": "Asili ya hati",
   "Document type": "Aina ya hati",
   "Edit": "Hariri",
   "Enter end date": "Weka tarehe ya mwisho",
   "Enter start date": "Weka tarehe ya kuanza",
+  "Exact phrase": "Exact phrase",
   "Expand all": "Panua zote",
   "Filters": "Vichujio",
   "Help": "Msaada",
+  "In these fields": "In these fields",
+  "Incorrect information": "Incorrect information",
   "Is there something wrong with this document?": "Je, kuna kitu kibaya na hati hii?",
   "Judges": "Majaji",
   "Jurisdiction": "Mamlaka ya kisheria",
@@ -39,17 +41,22 @@
   "Loading": "Inapakia",
   "Locality": "Eneo",
   "Matter type": "Aina ya jambo",
+  "Missing information": "Missing information",
   "More than 10,000 documents found": "Zaidi ya nyaraka 10,000 zimepatikana.",
   "Multiple languages available": "Lugha nyingi zinapatikana",
   "Nature": "Asili",
   "No documents match your search": "Hakuna hati zinazolingana na utafutaji wako.",
   "No legislation found": "Hakuna sheria iliyopatikana.",
+  "No PDF download": "No PDF download",
   "No results": "Hakuna matokeo",
-  "None of these words": "Hakuna maneno haya",
+  "NOT": "NOT",
   "Numbered title": "Jina lenye namba",
   "Oops, something went wrong": "Oh, kuna hitilafu imetokea.",
+  "OR": "OR",
   "Order": "Agizo",
+  "Other": "Other",
   "Page": "Ukurasa",
+  "Problem category": "Problem category",
   "Regional body": "Chombo cha kanda",
   "Relevance": "Muhimu",
   "Remove": "Ondoa",
@@ -63,12 +70,12 @@
   "Search table of contents": "Tafuta yaliyomo",
   "Share": "Sambaza",
   "Show changes side-by-side": "Tafuta yaliyomo sambamba",
+  "Show full text": "Show full text",
   "Something went wrong": "Kuna hitilafu imetokea.",
   "Sort by": "Ainisha kwa",
   "Taxonomies": "Taksonomia",
   "Thank you for your feedback": "Asante kwa maoni yako.",
   "The date range is invalid": "Tarehe siyo sahihi",
-  "This exact word or phrase": "Neno au kifungu hiki cha maneno",
   "This provision": "Kifungu hiki",
   "This provision has been amended": "Kifungu hiki kimerekebishwa",
   "Title": "Mada",
@@ -78,5 +85,5 @@
   "What's the problem?": "Tatizo ni nini?",
   "Year": "Mwaka",
   "Years": "Miaka",
-  "Your email address (optional)": "Anwani yako ya barua pepe (si lazima)"
+  "Your email address": "Your email address"
 }