diff --git a/package.json b/package.json
index 7fc167f..48099dd 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "lexiconga",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "description": "The quick and easy dictionary builder for constructed languages.",
   "main": "template-index.html",
   "repository": "https://github.com/Alamantus/Lexiconga.git",
diff --git a/src/js/render/details.js b/src/js/render/details.js
index e0b18b8..7a26c2d 100644
--- a/src/js/render/details.js
+++ b/src/js/render/details.js
@@ -123,7 +123,7 @@ export function renderPartsOfSpeech(onlyOptions = false) {
     searchHTML = '<label>Unclassified <input type="checkbox" checked id="searchPartOfSpeech__None"></label>';
   window.currentDictionary.partsOfSpeech.forEach(partOfSpeech => {
     partOfSpeech = removeTags(partOfSpeech);
-    optionsHTML += `<option value="${partOfSpeech}">${partOfSpeech}</option>`;
+    optionsHTML += `<option value="${partOfSpeech.replace(/"/g, '&quot;')}">${partOfSpeech}</option>`;
     searchHTML += `<label>${partOfSpeech} <input type="checkbox" checked id="searchPartOfSpeech_${slugify(partOfSpeech)}"></label>`;
   });
   searchHTML += `<a class="small button" id="checkAllFilters">Check All</a> <a class="small button" id="uncheckAllFilters">Uncheck All</a>`;
diff --git a/src/js/render/words.js b/src/js/render/words.js
index e8e0d56..4bf9feb 100644
--- a/src/js/render/words.js
+++ b/src/js/render/words.js
@@ -160,25 +160,26 @@ export function renderEditForm(wordId = false) {
   wordId = typeof wordId.target === 'undefined' ? wordId : parseInt(this.id.replace('edit_', ''));
   const word = window.currentDictionary.words.find(w => w.wordId === wordId);
   if (word) {
+    const escapeQuotes = (value) => value.replace(/"/g, '&quot;');
     const wordHasAdvancedFields = (word.hasOwnProperty('etymology') && word.etymology)
       || (word.hasOwnProperty('related') && word.related) || (word.hasOwnProperty('principalParts') && word.principalParts);
-    const ipaPronunciationField = `<input id="wordPronunciation_${wordId}" class="ipa-field" maxlength="200" value="${word.pronunciation}"><br>
+    const ipaPronunciationField = `<input id="wordPronunciation_${wordId}" class="ipa-field" maxlength="200" value="${escapeQuotes(word.pronunciation)}"><br>
       <a class="label-help-button ipa-field-help-button">Field Help</a>`;
-    const plainPronunciationField = `<input id="wordPronunciation_${wordId}" maxlength="200" value="${word.pronunciation}">`;
+    const plainPronunciationField = `<input id="wordPronunciation_${wordId}" maxlength="200" value="${escapeQuotes(word.pronunciation)}">`;
     const editForm = `<form id="editForm_${wordId}" class="edit-form">
       <label>Word<span class="red">*</span><br>
-        <input id="wordName_${wordId}" maxlength="200" value="${word.name}">
+        <input id="wordName_${wordId}" maxlength="200" value="${escapeQuotes(word.name)}">
       </label>
       <label>Pronunciation<a class="label-button ipa-table-button">IPA Chart</a><br>
         ${window.settings.useIPAPronunciationField ? ipaPronunciationField : plainPronunciationField}
       </label>
       <label>Part of Speech<br>
         <select id="wordPartOfSpeech_${wordId}" class="part-of-speech-select">
-          <option value="${word.partOfSpeech}" selected>${word.partOfSpeech}</option>
+          <option value="${escapeQuotes(word.partOfSpeech)}" selected>${word.partOfSpeech}</option>
         </select>
       </label>
       <label>Definition<span class="red">*</span><br>
-        <input id="wordDefinition_${wordId}" maxlength="2500" value="${word.definition}" placeholder="Equivalent words">
+        <input id="wordDefinition_${wordId}" maxlength="2500" value="${escapeQuotes(word.definition)}" placeholder="Equivalent words">
       </label>
       <label>Details<span class="red">*</span><a class="label-button maximize-button">Maximize</a><br>
         <textarea id="wordDetails_${wordId}" placeholder="Markdown formatting allowed">${word.details}</textarea>
@@ -193,13 +194,13 @@ export function renderEditForm(wordId = false) {
           <small>Choose one to fill the details field. (Note: Will erase anything currently there.)</small>
         </label>
         <label>Etymology / Root Words<br>
-          <input id="wordEtymology_${wordId}" maxlength="2500" placeholder="comma,separated,root,words" value="${word.hasOwnProperty('etymology') ? word.etymology : ''}">
+          <input id="wordEtymology_${wordId}" maxlength="2500" placeholder="comma,separated,root,words" value="${word.hasOwnProperty('etymology') ? escapeQuotes(word.etymology.toString()) : ''}">
         </label>
         <label>Related Words<br>
-          <input id="wordRelated_${wordId}" maxlength="2500" placeholder="comma,separated,related,words" value="${word.hasOwnProperty('related') ? word.related : ''}">
+          <input id="wordRelated_${wordId}" maxlength="2500" placeholder="comma,separated,related,words" value="${word.hasOwnProperty('related') ? escapeQuotes(word.related.toString()) : ''}">
         </label>
         <label>Principal Parts<a href="https://en.wikipedia.org/wiki/Principal_parts" target="_blank" class="label-button">What's This?</a><br>
-          <input id="wordPrincipalParts_${wordId}" maxlength="2500" placeholder="comma,separated,principal,parts" value="${word.hasOwnProperty('principalParts') ? word.principalParts : ''}">
+          <input id="wordPrincipalParts_${wordId}" maxlength="2500" placeholder="comma,separated,principal,parts" value="${word.hasOwnProperty('principalParts') ? escapeQuotes(word.principalParts.toString()) : ''}">
         </label>
       </div>
       <div id="wordErrorMessage_${wordId}"></div>
diff --git a/src/js/view/render.js b/src/js/view/render.js
index ebf27f8..b94916f 100644
--- a/src/js/view/render.js
+++ b/src/js/view/render.js
@@ -131,7 +131,7 @@ export function renderPartsOfSpeech(onlyOptions = false) {
     searchHTML = '<label>Unclassified <input type="checkbox" checked id="searchPartOfSpeech__None"></label>';
   window.currentDictionary.partsOfSpeech.forEach(partOfSpeech => {
     partOfSpeech = removeTags(partOfSpeech);
-    optionsHTML += `<option value="${partOfSpeech}">${partOfSpeech}</option>`;
+    optionsHTML += `<option value="${partOfSpeech.replace(/"/g, '&quot;')}">${partOfSpeech}</option>`;
     searchHTML += `<label>${partOfSpeech} <input type="checkbox" checked id="searchPartOfSpeech_${slugify(partOfSpeech)}"></label>`;
   });
   searchHTML += `<a class="small button" id="checkAllFilters">Check All</a> <a class="small button" id="uncheckAllFilters">Uncheck All</a>`;
diff --git a/src/php/router.php b/src/php/router.php
index 188102b..d448fdb 100644
--- a/src/php/router.php
+++ b/src/php/router.php
@@ -134,7 +134,7 @@ switch ($view) {
       oldLoad && oldLoad();
       if (UpUp) {
         UpUp.start({
-          'cache-version': '2.2.0',
+          'cache-version': '2.2.1',
           'content-url': 'offline.html',
           'assets': [
             \"" . implode('","', $files) . "\"