Update test valid dictionaries (#1688)

* Update test data for valid-dictionary1

* Use valid-dictionary1 instead of valid-dictionary2

* Update test data

* Remove test of valid-dictionary2

* Remove valid-dictionary2 data

22 files changed, 3168 insertions, 7680 deletions

diff --git a/test/data/anki-note-builder-test-results.json b/test/data/anki-note-builder-test-results.json
index 851584c8..c6405439 100644
--- a/test/data/anki-note-builder-test-results.json
+++ b/test/data/anki-note-builder-test-results.json
@@ -11,7 +11,7 @@
         "cloze-suffix": "cloze-suffix",
         "dictionary": "Test Dictionary 2",
         "document-title": "title",
-        "glossary": "<div style=\"text-align: left;\"><ol><li>meaning1</li><li>meaning2</li><li>meaning3</li><li>meaning4</li><li>meaning5</li></ol></div>",
+        "glossary": "<div style=\"text-align: left;\"><ol><li>utsu meaning 1</li><li>utsu meaning 2</li><li>utsu meaning 3</li><li>utsu meaning 4</li><li>utsu meaning 5</li></ol></div>",
         "kunyomi": "う.つ, う.ち-, ぶ.つ",
         "onyomi": "ダ, ダアス",
         "screenshot": "<img src=\"\" />",
@@ -35,7 +35,7 @@
         "cloze-suffix": "cloze-suffix",
         "dictionary": "Test Dictionary 2",
         "document-title": "title",
-        "glossary": "<div style=\"text-align: left;\"><ol><li>meaning1</li><li>meaning2</li><li>meaning3</li><li>meaning4</li><li>meaning5</li></ol></div>",
+        "glossary": "<div style=\"text-align: left;\"><ol><li>komu meaning 1</li><li>komu meaning 2</li><li>komu meaning 3</li><li>komu meaning 4</li><li>komu meaning 5</li></ol></div>",
         "kunyomi": "-こ.む, こ.む, こ.み, -こ.み, こ.める",
         "onyomi": "",
         "screenshot": "<img src=\"\" />",
@@ -68,10 +68,10 @@
         "frequencies": "<ul style=\"text-align: left;\"><li>Test Dictionary 2: 1</li><li>Test Dictionary 2: 4</li></ul>",
         "furigana": "<ruby>打<rt>だ</rt></ruby>",
         "furigana-plain": "打[だ]",
-        "glossary": "<div style=\"text-align: left;\"><i>(tag1, tag2, Test Dictionary 2)</i> <ul><li>definition1</li><li>definition2</li></ul></div>",
-        "glossary-brief": "<div style=\"text-align: left;\"><ul><li>definition1</li><li>definition2</li></ul></div>",
-        "glossary-no-dictionary": "<div style=\"text-align: left;\"><i>(tag1, tag2)</i> <ul><li>definition1</li><li>definition2</li></ul></div>",
-        "part-of-speech": "Unknown",
+        "glossary": "<div style=\"text-align: left;\"><i>(n, Test Dictionary 2)</i> <ul><li>da definition 1</li><li>da definition 2</li></ul></div>",
+        "glossary-brief": "<div style=\"text-align: left;\"><ul><li>da definition 1</li><li>da definition 2</li></ul></div>",
+        "glossary-no-dictionary": "<div style=\"text-align: left;\"><i>(n)</i> <ul><li>da definition 1</li><li>da definition 2</li></ul></div>",
+        "part-of-speech": "Noun",
         "pitch-accents": "No pitch accent data",
         "pitch-accent-graphs": "No pitch accent data",
         "pitch-accent-positions": "No pitch accent data",
@@ -79,7 +79,7 @@
         "screenshot": "<img src=\"\" />",
         "search-query": "fullQuery",
         "sentence": "cloze-prefix打cloze-suffix",
-        "tags": "tag1, tag2",
+        "tags": "n",
         "url": "<a href=\"url:\">url:</a>"
       },
       {
@@ -96,10 +96,10 @@
         "frequencies": "<ul style=\"text-align: left;\"><li>Test Dictionary 2: 1</li><li>Test Dictionary 2: 5</li></ul>",
         "furigana": "<ruby>打<rt>ダース</rt></ruby>",
         "furigana-plain": "打[ダース]",
-        "glossary": "<div style=\"text-align: left;\"><i>(tag1, tag2, Test Dictionary 2)</i> <ul><li>definition3</li><li>definition4</li></ul></div>",
-        "glossary-brief": "<div style=\"text-align: left;\"><ul><li>definition3</li><li>definition4</li></ul></div>",
-        "glossary-no-dictionary": "<div style=\"text-align: left;\"><i>(tag1, tag2)</i> <ul><li>definition3</li><li>definition4</li></ul></div>",
-        "part-of-speech": "Unknown",
+        "glossary": "<div style=\"text-align: left;\"><i>(abbr, n, Test Dictionary 2)</i> <ul><li>daasu definition 1</li><li>daasu definition 2</li></ul></div>",
+        "glossary-brief": "<div style=\"text-align: left;\"><ul><li>daasu definition 1</li><li>daasu definition 2</li></ul></div>",
+        "glossary-no-dictionary": "<div style=\"text-align: left;\"><i>(abbr, n)</i> <ul><li>daasu definition 1</li><li>daasu definition 2</li></ul></div>",
+        "part-of-speech": "Noun",
         "pitch-accents": "No pitch accent data",
         "pitch-accent-graphs": "No pitch accent data",
         "pitch-accent-positions": "No pitch accent data",
@@ -107,7 +107,7 @@
         "screenshot": "<img src=\"\" />",
         "search-query": "fullQuery",
         "sentence": "cloze-prefix打cloze-suffix",
-        "tags": "tag1, tag2",
+        "tags": "abbr, n",
         "url": "<a href=\"url:\">url:</a>"
       }
     ]
@@ -129,9 +129,9 @@
         "frequencies": "<ul style=\"text-align: left;\"><li>Test Dictionary 2: 2</li><li>Test Dictionary 2: 6</li></ul>",
         "furigana": "<ruby>打<rt>う</rt></ruby>つ",
         "furigana-plain": "打[う]つ",
-        "glossary": "<div style=\"text-align: left;\"><i>(tag1, tag2, Test Dictionary 2)</i> <ul><li>definition5</li><li>definition6</li></ul></div>",
-        "glossary-brief": "<div style=\"text-align: left;\"><ul><li>definition5</li><li>definition6</li></ul></div>",
-        "glossary-no-dictionary": "<div style=\"text-align: left;\"><i>(tag1, tag2)</i> <ul><li>definition5</li><li>definition6</li></ul></div>",
+        "glossary": "<div style=\"text-align: left;\"><i>(vt, Test Dictionary 2)</i> <ul><li>utsu definition 1</li><li>utsu definition 2</li></ul></div>",
+        "glossary-brief": "<div style=\"text-align: left;\"><ul><li>utsu definition 1</li><li>utsu definition 2</li></ul></div>",
+        "glossary-no-dictionary": "<div style=\"text-align: left;\"><i>(vt)</i> <ul><li>utsu definition 1</li><li>utsu definition 2</li></ul></div>",
         "part-of-speech": "Godan verb",
         "pitch-accents": "No pitch accent data",
         "pitch-accent-graphs": "No pitch accent data",
@@ -140,7 +140,7 @@
         "screenshot": "<img src=\"\" />",
         "search-query": "fullQuery",
         "sentence": "cloze-prefix打つcloze-suffix",
-        "tags": "tag1, tag2",
+        "tags": "vt",
         "url": "<a href=\"url:\">url:</a>"
       },
       {
@@ -157,9 +157,9 @@
         "frequencies": "<ul style=\"text-align: left;\"><li>Test Dictionary 2: 2</li><li>Test Dictionary 2: 7</li></ul>",
         "furigana": "<ruby>打<rt>ぶ</rt></ruby>つ",
         "furigana-plain": "打[ぶ]つ",
-        "glossary": "<div style=\"text-align: left;\"><i>(tag1, tag2, Test Dictionary 2)</i> <ul><li>definition9</li><li>definition10</li></ul></div>",
-        "glossary-brief": "<div style=\"text-align: left;\"><ul><li>definition9</li><li>definition10</li></ul></div>",
-        "glossary-no-dictionary": "<div style=\"text-align: left;\"><i>(tag1, tag2)</i> <ul><li>definition9</li><li>definition10</li></ul></div>",
+        "glossary": "<div style=\"text-align: left;\"><i>(vt, Test Dictionary 2)</i> <ul><li>butsu definition 1</li><li>butsu definition 2</li></ul></div>",
+        "glossary-brief": "<div style=\"text-align: left;\"><ul><li>butsu definition 1</li><li>butsu definition 2</li></ul></div>",
+        "glossary-no-dictionary": "<div style=\"text-align: left;\"><i>(vt)</i> <ul><li>butsu definition 1</li><li>butsu definition 2</li></ul></div>",
         "part-of-speech": "Godan verb",
         "pitch-accents": "No pitch accent data",
         "pitch-accent-graphs": "No pitch accent data",
@@ -168,7 +168,7 @@
         "screenshot": "<img src=\"\" />",
         "search-query": "fullQuery",
         "sentence": "cloze-prefix打つcloze-suffix",
-        "tags": "tag1, tag2",
+        "tags": "vt",
         "url": "<a href=\"url:\">url:</a>"
       },
       {
@@ -185,9 +185,9 @@
         "frequencies": "<ul style=\"text-align: left;\"><li>Test Dictionary 2: 2</li><li>Test Dictionary 2: 6</li></ul>",
         "furigana": "<ruby>打<rt>う</rt></ruby>つ",
         "furigana-plain": "打[う]つ",
-        "glossary": "<div style=\"text-align: left;\"><i>(tag1, tag2, Test Dictionary 2)</i> <ul><li>definition7</li><li>definition8</li></ul></div>",
-        "glossary-brief": "<div style=\"text-align: left;\"><ul><li>definition7</li><li>definition8</li></ul></div>",
-        "glossary-no-dictionary": "<div style=\"text-align: left;\"><i>(tag1, tag2)</i> <ul><li>definition7</li><li>definition8</li></ul></div>",
+        "glossary": "<div style=\"text-align: left;\"><i>(vt, Test Dictionary 2)</i> <ul><li>utsu definition 3</li><li>utsu definition 4</li></ul></div>",
+        "glossary-brief": "<div style=\"text-align: left;\"><ul><li>utsu definition 3</li><li>utsu definition 4</li></ul></div>",
+        "glossary-no-dictionary": "<div style=\"text-align: left;\"><i>(vt)</i> <ul><li>utsu definition 3</li><li>utsu definition 4</li></ul></div>",
         "part-of-speech": "Godan verb",
         "pitch-accents": "No pitch accent data",
         "pitch-accent-graphs": "No pitch accent data",
@@ -196,7 +196,7 @@
         "screenshot": "<img src=\"\" />",
         "search-query": "fullQuery",
         "sentence": "cloze-prefix打つcloze-suffix",
-        "tags": "tag1, tag2",
+        "tags": "vt",
         "url": "<a href=\"url:\">url:</a>"
       },
       {
@@ -213,9 +213,9 @@
         "frequencies": "<ul style=\"text-align: left;\"><li>Test Dictionary 2: 2</li><li>Test Dictionary 2: 7</li></ul>",
         "furigana": "<ruby>打<rt>ぶ</rt></ruby>つ",
         "furigana-plain": "打[ぶ]つ",
-        "glossary": "<div style=\"text-align: left;\"><i>(tag1, tag2, Test Dictionary 2)</i> <ul><li>definition11</li><li>definition12</li></ul></div>",
-        "glossary-brief": "<div style=\"text-align: left;\"><ul><li>definition11</li><li>definition12</li></ul></div>",
-        "glossary-no-dictionary": "<div style=\"text-align: left;\"><i>(tag1, tag2)</i> <ul><li>definition11</li><li>definition12</li></ul></div>",
+        "glossary": "<div style=\"text-align: left;\"><i>(vt, Test Dictionary 2)</i> <ul><li>butsu definition 3</li><li>butsu definition 4</li></ul></div>",
+        "glossary-brief": "<div style=\"text-align: left;\"><ul><li>butsu definition 3</li><li>butsu definition 4</li></ul></div>",
+        "glossary-no-dictionary": "<div style=\"text-align: left;\"><i>(vt)</i> <ul><li>butsu definition 3</li><li>butsu definition 4</li></ul></div>",
         "part-of-speech": "Godan verb",
         "pitch-accents": "No pitch accent data",
         "pitch-accent-graphs": "No pitch accent data",
@@ -224,7 +224,7 @@
         "screenshot": "<img src=\"\" />",
         "search-query": "fullQuery",
         "sentence": "cloze-prefix打つcloze-suffix",
-        "tags": "tag1, tag2",
+        "tags": "vt",
         "url": "<a href=\"url:\">url:</a>"
       },
       {
@@ -241,10 +241,10 @@
         "frequencies": "<ul style=\"text-align: left;\"><li>Test Dictionary 2: 1</li><li>Test Dictionary 2: 4</li></ul>",
         "furigana": "<ruby>打<rt>だ</rt></ruby>",
         "furigana-plain": "打[だ]",
-        "glossary": "<div style=\"text-align: left;\"><i>(tag1, tag2, Test Dictionary 2)</i> <ul><li>definition1</li><li>definition2</li></ul></div>",
-        "glossary-brief": "<div style=\"text-align: left;\"><ul><li>definition1</li><li>definition2</li></ul></div>",
-        "glossary-no-dictionary": "<div style=\"text-align: left;\"><i>(tag1, tag2)</i> <ul><li>definition1</li><li>definition2</li></ul></div>",
-        "part-of-speech": "Unknown",
+        "glossary": "<div style=\"text-align: left;\"><i>(n, Test Dictionary 2)</i> <ul><li>da definition 1</li><li>da definition 2</li></ul></div>",
+        "glossary-brief": "<div style=\"text-align: left;\"><ul><li>da definition 1</li><li>da definition 2</li></ul></div>",
+        "glossary-no-dictionary": "<div style=\"text-align: left;\"><i>(n)</i> <ul><li>da definition 1</li><li>da definition 2</li></ul></div>",
+        "part-of-speech": "Noun",
         "pitch-accents": "No pitch accent data",
         "pitch-accent-graphs": "No pitch accent data",
         "pitch-accent-positions": "No pitch accent data",
@@ -252,7 +252,7 @@
         "screenshot": "<img src=\"\" />",
         "search-query": "fullQuery",
         "sentence": "cloze-prefix打cloze-suffix",
-        "tags": "tag1, tag2",
+        "tags": "n",
         "url": "<a href=\"url:\">url:</a>"
       },
       {
@@ -269,10 +269,10 @@
         "frequencies": "<ul style=\"text-align: left;\"><li>Test Dictionary 2: 1</li><li>Test Dictionary 2: 5</li></ul>",
         "furigana": "<ruby>打<rt>ダース</rt></ruby>",
         "furigana-plain": "打[ダース]",
-        "glossary": "<div style=\"text-align: left;\"><i>(tag1, tag2, Test Dictionary 2)</i> <ul><li>definition3</li><li>definition4</li></ul></div>",
-        "glossary-brief": "<div style=\"text-align: left;\"><ul><li>definition3</li><li>definition4</li></ul></div>",
-        "glossary-no-dictionary": "<div style=\"text-align: left;\"><i>(tag1, tag2)</i> <ul><li>definition3</li><li>definition4</li></ul></div>",
-        "part-of-speech": "Unknown",
+        "glossary": "<div style=\"text-align: left;\"><i>(abbr, n, Test Dictionary 2)</i> <ul><li>daasu definition 1</li><li>daasu definition 2</li></ul></div>",
+        "glossary-brief": "<div style=\"text-align: left;\"><ul><li>daasu definition 1</li><li>daasu definition 2</li></ul></div>",
+        "glossary-no-dictionary": "<div style=\"text-align: left;\"><i>(abbr, n)</i> <ul><li>daasu definition 1</li><li>daasu definition 2</li></ul></div>",
+        "part-of-speech": "Noun",
         "pitch-accents": "No pitch accent data",
         "pitch-accent-graphs": "No pitch accent data",
         "pitch-accent-positions": "No pitch accent data",
@@ -280,7 +280,7 @@
         "screenshot": "<img src=\"\" />",
         "search-query": "fullQuery",
         "sentence": "cloze-prefix打cloze-suffix",
-        "tags": "tag1, tag2",
+        "tags": "abbr, n",
         "url": "<a href=\"url:\">url:</a>"
       }
     ]
@@ -302,9 +302,9 @@
         "frequencies": "<ul style=\"text-align: left;\"><li>Test Dictionary 2: 3</li><li>Test Dictionary 2: 8</li></ul>",
         "furigana": "<ruby>打<rt>う</rt></ruby>ち<ruby>込<rt>こ</rt></ruby>む",
         "furigana-plain": "打[う]ち 込[こ]む",
-        "glossary": "<div style=\"text-align: left;\"><i>(tag1, tag2, Test Dictionary 2)</i> <ul><li>definition13</li><li>definition14</li></ul></div>",
-        "glossary-brief": "<div style=\"text-align: left;\"><ul><li>definition13</li><li>definition14</li></ul></div>",
-        "glossary-no-dictionary": "<div style=\"text-align: left;\"><i>(tag1, tag2)</i> <ul><li>definition13</li><li>definition14</li></ul></div>",
+        "glossary": "<div style=\"text-align: left;\"><i>(vt, Test Dictionary 2)</i> <ul><li>uchikomu definition 1</li><li>uchikomu definition 2</li></ul></div>",
+        "glossary-brief": "<div style=\"text-align: left;\"><ul><li>uchikomu definition 1</li><li>uchikomu definition 2</li></ul></div>",
+        "glossary-no-dictionary": "<div style=\"text-align: left;\"><i>(vt)</i> <ul><li>uchikomu definition 1</li><li>uchikomu definition 2</li></ul></div>",
         "part-of-speech": "Godan verb",
         "pitch-accents": "<ol><li><span><span style=\"display:inline-block;position:relative;\">う<span style=\"\"></span></span><span style=\"display:inline-block;position:relative;\">ち<span style=\"display:block;user-select:none;pointer-events:none;position:absolute;top:0.1em;left:0;right:0;height:0;border-top:0.1em solid;\"></span></span><span style=\"display:inline-block;position:relative;\">こ<span style=\"display:block;user-select:none;pointer-events:none;position:absolute;top:0.1em;left:0;right:0;height:0;border-top:0.1em solid;\"></span></span><span style=\"display:inline-block;position:relative;\">む<span style=\"display:block;user-select:none;pointer-events:none;position:absolute;top:0.1em;left:0;right:0;height:0;border-top:0.1em solid;\"></span></span></span></li><li><span><span style=\"display:inline-block;position:relative;\">う<span style=\"\"></span></span><span style=\"display:inline-block;position:relative;\">ち<span style=\"display:block;user-select:none;pointer-events:none;position:absolute;top:0.1em;left:0;right:0;height:0;border-top:0.1em solid;\"></span></span><span style=\"display:inline-block;position:relative;padding-right:0.1em;margin-right:0.1em;\">こ<span style=\"display:block;user-select:none;pointer-events:none;position:absolute;top:0.1em;left:0;right:0;height:0;border-top:0.1em solid;right:-0.1em;height:0.4em;border-right:0.1em solid;\"></span></span><span style=\"display:inline-block;position:relative;\">む<span style=\"\"></span></span></span></li></ol>",
         "pitch-accent-graphs": "<ol><li><svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 250 100\" style=\"display:inline-block;height:2em;\">\n    <defs>\n        <g id=\"term-pitch-accent-graph-dot\"><circle cx=\"0\" cy=\"0\" r=\"15\" style=\"fill:#000;stroke:#000;stroke-width:5;\" /></g>\n        <g id=\"term-pitch-accent-graph-dot-downstep\"><circle cx=\"0\" cy=\"0\" r=\"15\" style=\"fill:none;stroke:#000;stroke-width:5;\" /><circle cx=\"0\" cy=\"0\" r=\"5\" style=\"fill:none;stroke:#000;stroke-width:5;\" /></g>\n        <g id=\"term-pitch-accent-graph-triangle\"><path d=\"M0 13 L15 -13 L-15 -13 Z\" style=\"fill:none;stroke:#000;stroke-width:5;\" /></g>\n    </defs>\n    <path style=\"fill:none;stroke:#000;stroke-width:5;\" d=\"M25 75L75 25L125 25L175 25\"></path>\n    <path style=\"fill:none;stroke:#000;stroke-width:5;stroke-dasharray:5 5;\" d=\"M175 25 L225 25\"></path>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"25\" y=\"75\"></use>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"75\" y=\"25\"></use>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"125\" y=\"25\"></use>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"175\" y=\"25\"></use>\n    <use href=\"#term-pitch-accent-graph-triangle\" x=\"225\" y=\"25\"></use>\n</svg></li><li><svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 250 100\" style=\"display:inline-block;height:2em;\">\n    <defs>\n        <g id=\"term-pitch-accent-graph-dot\"><circle cx=\"0\" cy=\"0\" r=\"15\" style=\"fill:#000;stroke:#000;stroke-width:5;\" /></g>\n        <g id=\"term-pitch-accent-graph-dot-downstep\"><circle cx=\"0\" cy=\"0\" r=\"15\" style=\"fill:none;stroke:#000;stroke-width:5;\" /><circle cx=\"0\" cy=\"0\" r=\"5\" style=\"fill:none;stroke:#000;stroke-width:5;\" /></g>\n        <g id=\"term-pitch-accent-graph-triangle\"><path d=\"M0 13 L15 -13 L-15 -13 Z\" style=\"fill:none;stroke:#000;stroke-width:5;\" /></g>\n    </defs>\n    <path style=\"fill:none;stroke:#000;stroke-width:5;\" d=\"M25 75L75 25L125 25L175 75\"></path>\n    <path style=\"fill:none;stroke:#000;stroke-width:5;stroke-dasharray:5 5;\" d=\"M175 75 L225 75\"></path>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"25\" y=\"75\"></use>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"75\" y=\"25\"></use>\n    <use href=\"#term-pitch-accent-graph-dot-downstep\" x=\"125\" y=\"25\"></use>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"175\" y=\"75\"></use>\n    <use href=\"#term-pitch-accent-graph-triangle\" x=\"225\" y=\"75\"></use>\n</svg></li></ol>",
@@ -313,7 +313,7 @@
         "screenshot": "<img src=\"\" />",
         "search-query": "fullQuery",
         "sentence": "cloze-prefix打ち込むcloze-suffix",
-        "tags": "tag1, tag2",
+        "tags": "vt",
         "url": "<a href=\"url:\">url:</a>"
       },
       {
@@ -330,9 +330,9 @@
         "frequencies": "<ul style=\"text-align: left;\"><li>Test Dictionary 2: 3</li><li>Test Dictionary 2: 9</li></ul>",
         "furigana": "<ruby>打<rt>ぶ</rt></ruby>ち<ruby>込<rt>こ</rt></ruby>む",
         "furigana-plain": "打[ぶ]ち 込[こ]む",
-        "glossary": "<div style=\"text-align: left;\"><i>(tag1, tag2, Test Dictionary 2)</i> <ul><li>definition17</li><li>definition18</li></ul></div>",
-        "glossary-brief": "<div style=\"text-align: left;\"><ul><li>definition17</li><li>definition18</li></ul></div>",
-        "glossary-no-dictionary": "<div style=\"text-align: left;\"><i>(tag1, tag2)</i> <ul><li>definition17</li><li>definition18</li></ul></div>",
+        "glossary": "<div style=\"text-align: left;\"><i>(vt, Test Dictionary 2)</i> <ul><li>buchikomu definition 1</li><li>buchikomu definition 2</li></ul></div>",
+        "glossary-brief": "<div style=\"text-align: left;\"><ul><li>buchikomu definition 1</li><li>buchikomu definition 2</li></ul></div>",
+        "glossary-no-dictionary": "<div style=\"text-align: left;\"><i>(vt)</i> <ul><li>buchikomu definition 1</li><li>buchikomu definition 2</li></ul></div>",
         "part-of-speech": "Godan verb",
         "pitch-accents": "<ol><li><span><span style=\"display:inline-block;position:relative;\">ぶ<span style=\"\"></span></span><span style=\"display:inline-block;position:relative;\">ち<span style=\"display:block;user-select:none;pointer-events:none;position:absolute;top:0.1em;left:0;right:0;height:0;border-top:0.1em solid;\"></span></span><span style=\"display:inline-block;position:relative;\">こ<span style=\"display:block;user-select:none;pointer-events:none;position:absolute;top:0.1em;left:0;right:0;height:0;border-top:0.1em solid;\"></span></span><span style=\"display:inline-block;position:relative;\">む<span style=\"display:block;user-select:none;pointer-events:none;position:absolute;top:0.1em;left:0;right:0;height:0;border-top:0.1em solid;\"></span></span></span></li><li><span><span style=\"display:inline-block;position:relative;\">ぶ<span style=\"\"></span></span><span style=\"display:inline-block;position:relative;\">ち<span style=\"display:block;user-select:none;pointer-events:none;position:absolute;top:0.1em;left:0;right:0;height:0;border-top:0.1em solid;\"></span></span><span style=\"display:inline-block;position:relative;padding-right:0.1em;margin-right:0.1em;\">こ<span style=\"display:block;user-select:none;pointer-events:none;position:absolute;top:0.1em;left:0;right:0;height:0;border-top:0.1em solid;right:-0.1em;height:0.4em;border-right:0.1em solid;\"></span></span><span style=\"display:inline-block;position:relative;\">む<span style=\"\"></span></span></span></li></ol>",
         "pitch-accent-graphs": "<ol><li><svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 250 100\" style=\"display:inline-block;height:2em;\">\n    <defs>\n        <g id=\"term-pitch-accent-graph-dot\"><circle cx=\"0\" cy=\"0\" r=\"15\" style=\"fill:#000;stroke:#000;stroke-width:5;\" /></g>\n        <g id=\"term-pitch-accent-graph-dot-downstep\"><circle cx=\"0\" cy=\"0\" r=\"15\" style=\"fill:none;stroke:#000;stroke-width:5;\" /><circle cx=\"0\" cy=\"0\" r=\"5\" style=\"fill:none;stroke:#000;stroke-width:5;\" /></g>\n        <g id=\"term-pitch-accent-graph-triangle\"><path d=\"M0 13 L15 -13 L-15 -13 Z\" style=\"fill:none;stroke:#000;stroke-width:5;\" /></g>\n    </defs>\n    <path style=\"fill:none;stroke:#000;stroke-width:5;\" d=\"M25 75L75 25L125 25L175 25\"></path>\n    <path style=\"fill:none;stroke:#000;stroke-width:5;stroke-dasharray:5 5;\" d=\"M175 25 L225 25\"></path>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"25\" y=\"75\"></use>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"75\" y=\"25\"></use>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"125\" y=\"25\"></use>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"175\" y=\"25\"></use>\n    <use href=\"#term-pitch-accent-graph-triangle\" x=\"225\" y=\"25\"></use>\n</svg></li><li><svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 250 100\" style=\"display:inline-block;height:2em;\">\n    <defs>\n        <g id=\"term-pitch-accent-graph-dot\"><circle cx=\"0\" cy=\"0\" r=\"15\" style=\"fill:#000;stroke:#000;stroke-width:5;\" /></g>\n        <g id=\"term-pitch-accent-graph-dot-downstep\"><circle cx=\"0\" cy=\"0\" r=\"15\" style=\"fill:none;stroke:#000;stroke-width:5;\" /><circle cx=\"0\" cy=\"0\" r=\"5\" style=\"fill:none;stroke:#000;stroke-width:5;\" /></g>\n        <g id=\"term-pitch-accent-graph-triangle\"><path d=\"M0 13 L15 -13 L-15 -13 Z\" style=\"fill:none;stroke:#000;stroke-width:5;\" /></g>\n    </defs>\n    <path style=\"fill:none;stroke:#000;stroke-width:5;\" d=\"M25 75L75 25L125 25L175 75\"></path>\n    <path style=\"fill:none;stroke:#000;stroke-width:5;stroke-dasharray:5 5;\" d=\"M175 75 L225 75\"></path>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"25\" y=\"75\"></use>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"75\" y=\"25\"></use>\n    <use href=\"#term-pitch-accent-graph-dot-downstep\" x=\"125\" y=\"25\"></use>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"175\" y=\"75\"></use>\n    <use href=\"#term-pitch-accent-graph-triangle\" x=\"225\" y=\"75\"></use>\n</svg></li></ol>",
@@ -341,7 +341,7 @@
         "screenshot": "<img src=\"\" />",
         "search-query": "fullQuery",
         "sentence": "cloze-prefix打ち込むcloze-suffix",
-        "tags": "tag1, tag2",
+        "tags": "vt",
         "url": "<a href=\"url:\">url:</a>"
       },
       {
@@ -358,9 +358,9 @@
         "frequencies": "<ul style=\"text-align: left;\"><li>Test Dictionary 2: 3</li><li>Test Dictionary 2: 8</li></ul>",
         "furigana": "<ruby>打<rt>う</rt></ruby>ち<ruby>込<rt>こ</rt></ruby>む",
         "furigana-plain": "打[う]ち 込[こ]む",
-        "glossary": "<div style=\"text-align: left;\"><i>(tag1, tag2, Test Dictionary 2)</i> <ul><li>definition15</li><li>definition16</li></ul></div>",
-        "glossary-brief": "<div style=\"text-align: left;\"><ul><li>definition15</li><li>definition16</li></ul></div>",
-        "glossary-no-dictionary": "<div style=\"text-align: left;\"><i>(tag1, tag2)</i> <ul><li>definition15</li><li>definition16</li></ul></div>",
+        "glossary": "<div style=\"text-align: left;\"><i>(vt, Test Dictionary 2)</i> <ul><li>uchikomu definition 3</li><li>uchikomu definition 4</li></ul></div>",
+        "glossary-brief": "<div style=\"text-align: left;\"><ul><li>uchikomu definition 3</li><li>uchikomu definition 4</li></ul></div>",
+        "glossary-no-dictionary": "<div style=\"text-align: left;\"><i>(vt)</i> <ul><li>uchikomu definition 3</li><li>uchikomu definition 4</li></ul></div>",
         "part-of-speech": "Godan verb",
         "pitch-accents": "<ol><li><span><span style=\"display:inline-block;position:relative;\">う<span style=\"\"></span></span><span style=\"display:inline-block;position:relative;\">ち<span style=\"display:block;user-select:none;pointer-events:none;position:absolute;top:0.1em;left:0;right:0;height:0;border-top:0.1em solid;\"></span></span><span style=\"display:inline-block;position:relative;\">こ<span style=\"display:block;user-select:none;pointer-events:none;position:absolute;top:0.1em;left:0;right:0;height:0;border-top:0.1em solid;\"></span></span><span style=\"display:inline-block;position:relative;\">む<span style=\"display:block;user-select:none;pointer-events:none;position:absolute;top:0.1em;left:0;right:0;height:0;border-top:0.1em solid;\"></span></span></span></li><li><span><span style=\"display:inline-block;position:relative;\">う<span style=\"\"></span></span><span style=\"display:inline-block;position:relative;\">ち<span style=\"display:block;user-select:none;pointer-events:none;position:absolute;top:0.1em;left:0;right:0;height:0;border-top:0.1em solid;\"></span></span><span style=\"display:inline-block;position:relative;padding-right:0.1em;margin-right:0.1em;\">こ<span style=\"display:block;user-select:none;pointer-events:none;position:absolute;top:0.1em;left:0;right:0;height:0;border-top:0.1em solid;right:-0.1em;height:0.4em;border-right:0.1em solid;\"></span></span><span style=\"display:inline-block;position:relative;\">む<span style=\"\"></span></span></span></li></ol>",
         "pitch-accent-graphs": "<ol><li><svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 250 100\" style=\"display:inline-block;height:2em;\">\n    <defs>\n        <g id=\"term-pitch-accent-graph-dot\"><circle cx=\"0\" cy=\"0\" r=\"15\" style=\"fill:#000;stroke:#000;stroke-width:5;\" /></g>\n        <g id=\"term-pitch-accent-graph-dot-downstep\"><circle cx=\"0\" cy=\"0\" r=\"15\" style=\"fill:none;stroke:#000;stroke-width:5;\" /><circle cx=\"0\" cy=\"0\" r=\"5\" style=\"fill:none;stroke:#000;stroke-width:5;\" /></g>\n        <g id=\"term-pitch-accent-graph-triangle\"><path d=\"M0 13 L15 -13 L-15 -13 Z\" style=\"fill:none;stroke:#000;stroke-width:5;\" /></g>\n    </defs>\n    <path style=\"fill:none;stroke:#000;stroke-width:5;\" d=\"M25 75L75 25L125 25L175 25\"></path>\n    <path style=\"fill:none;stroke:#000;stroke-width:5;stroke-dasharray:5 5;\" d=\"M175 25 L225 25\"></path>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"25\" y=\"75\"></use>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"75\" y=\"25\"></use>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"125\" y=\"25\"></use>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"175\" y=\"25\"></use>\n    <use href=\"#term-pitch-accent-graph-triangle\" x=\"225\" y=\"25\"></use>\n</svg></li><li><svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 250 100\" style=\"display:inline-block;height:2em;\">\n    <defs>\n        <g id=\"term-pitch-accent-graph-dot\"><circle cx=\"0\" cy=\"0\" r=\"15\" style=\"fill:#000;stroke:#000;stroke-width:5;\" /></g>\n        <g id=\"term-pitch-accent-graph-dot-downstep\"><circle cx=\"0\" cy=\"0\" r=\"15\" style=\"fill:none;stroke:#000;stroke-width:5;\" /><circle cx=\"0\" cy=\"0\" r=\"5\" style=\"fill:none;stroke:#000;stroke-width:5;\" /></g>\n        <g id=\"term-pitch-accent-graph-triangle\"><path d=\"M0 13 L15 -13 L-15 -13 Z\" style=\"fill:none;stroke:#000;stroke-width:5;\" /></g>\n    </defs>\n    <path style=\"fill:none;stroke:#000;stroke-width:5;\" d=\"M25 75L75 25L125 25L175 75\"></path>\n    <path style=\"fill:none;stroke:#000;stroke-width:5;stroke-dasharray:5 5;\" d=\"M175 75 L225 75\"></path>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"25\" y=\"75\"></use>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"75\" y=\"25\"></use>\n    <use href=\"#term-pitch-accent-graph-dot-downstep\" x=\"125\" y=\"25\"></use>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"175\" y=\"75\"></use>\n    <use href=\"#term-pitch-accent-graph-triangle\" x=\"225\" y=\"75\"></use>\n</svg></li></ol>",
@@ -369,7 +369,7 @@
         "screenshot": "<img src=\"\" />",
         "search-query": "fullQuery",
         "sentence": "cloze-prefix打ち込むcloze-suffix",
-        "tags": "tag1, tag2",
+        "tags": "vt",
         "url": "<a href=\"url:\">url:</a>"
       },
       {
@@ -386,9 +386,9 @@
         "frequencies": "<ul style=\"text-align: left;\"><li>Test Dictionary 2: 3</li><li>Test Dictionary 2: 9</li></ul>",
         "furigana": "<ruby>打<rt>ぶ</rt></ruby>ち<ruby>込<rt>こ</rt></ruby>む",
         "furigana-plain": "打[ぶ]ち 込[こ]む",
-        "glossary": "<div style=\"text-align: left;\"><i>(tag1, tag2, Test Dictionary 2)</i> <ul><li>definition19</li><li>definition20</li></ul></div>",
-        "glossary-brief": "<div style=\"text-align: left;\"><ul><li>definition19</li><li>definition20</li></ul></div>",
-        "glossary-no-dictionary": "<div style=\"text-align: left;\"><i>(tag1, tag2)</i> <ul><li>definition19</li><li>definition20</li></ul></div>",
+        "glossary": "<div style=\"text-align: left;\"><i>(vt, Test Dictionary 2)</i> <ul><li>buchikomu definition 3</li><li>buchikomu definition 4</li></ul></div>",
+        "glossary-brief": "<div style=\"text-align: left;\"><ul><li>buchikomu definition 3</li><li>buchikomu definition 4</li></ul></div>",
+        "glossary-no-dictionary": "<div style=\"text-align: left;\"><i>(vt)</i> <ul><li>buchikomu definition 3</li><li>buchikomu definition 4</li></ul></div>",
         "part-of-speech": "Godan verb",
         "pitch-accents": "<ol><li><span><span style=\"display:inline-block;position:relative;\">ぶ<span style=\"\"></span></span><span style=\"display:inline-block;position:relative;\">ち<span style=\"display:block;user-select:none;pointer-events:none;position:absolute;top:0.1em;left:0;right:0;height:0;border-top:0.1em solid;\"></span></span><span style=\"display:inline-block;position:relative;\">こ<span style=\"display:block;user-select:none;pointer-events:none;position:absolute;top:0.1em;left:0;right:0;height:0;border-top:0.1em solid;\"></span></span><span style=\"display:inline-block;position:relative;\">む<span style=\"display:block;user-select:none;pointer-events:none;position:absolute;top:0.1em;left:0;right:0;height:0;border-top:0.1em solid;\"></span></span></span></li><li><span><span style=\"display:inline-block;position:relative;\">ぶ<span style=\"\"></span></span><span style=\"display:inline-block;position:relative;\">ち<span style=\"display:block;user-select:none;pointer-events:none;position:absolute;top:0.1em;left:0;right:0;height:0;border-top:0.1em solid;\"></span></span><span style=\"display:inline-block;position:relative;padding-right:0.1em;margin-right:0.1em;\">こ<span style=\"display:block;user-select:none;pointer-events:none;position:absolute;top:0.1em;left:0;right:0;height:0;border-top:0.1em solid;right:-0.1em;height:0.4em;border-right:0.1em solid;\"></span></span><span style=\"display:inline-block;position:relative;\">む<span style=\"\"></span></span></span></li></ol>",
         "pitch-accent-graphs": "<ol><li><svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 250 100\" style=\"display:inline-block;height:2em;\">\n    <defs>\n        <g id=\"term-pitch-accent-graph-dot\"><circle cx=\"0\" cy=\"0\" r=\"15\" style=\"fill:#000;stroke:#000;stroke-width:5;\" /></g>\n        <g id=\"term-pitch-accent-graph-dot-downstep\"><circle cx=\"0\" cy=\"0\" r=\"15\" style=\"fill:none;stroke:#000;stroke-width:5;\" /><circle cx=\"0\" cy=\"0\" r=\"5\" style=\"fill:none;stroke:#000;stroke-width:5;\" /></g>\n        <g id=\"term-pitch-accent-graph-triangle\"><path d=\"M0 13 L15 -13 L-15 -13 Z\" style=\"fill:none;stroke:#000;stroke-width:5;\" /></g>\n    </defs>\n    <path style=\"fill:none;stroke:#000;stroke-width:5;\" d=\"M25 75L75 25L125 25L175 25\"></path>\n    <path style=\"fill:none;stroke:#000;stroke-width:5;stroke-dasharray:5 5;\" d=\"M175 25 L225 25\"></path>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"25\" y=\"75\"></use>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"75\" y=\"25\"></use>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"125\" y=\"25\"></use>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"175\" y=\"25\"></use>\n    <use href=\"#term-pitch-accent-graph-triangle\" x=\"225\" y=\"25\"></use>\n</svg></li><li><svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 250 100\" style=\"display:inline-block;height:2em;\">\n    <defs>\n        <g id=\"term-pitch-accent-graph-dot\"><circle cx=\"0\" cy=\"0\" r=\"15\" style=\"fill:#000;stroke:#000;stroke-width:5;\" /></g>\n        <g id=\"term-pitch-accent-graph-dot-downstep\"><circle cx=\"0\" cy=\"0\" r=\"15\" style=\"fill:none;stroke:#000;stroke-width:5;\" /><circle cx=\"0\" cy=\"0\" r=\"5\" style=\"fill:none;stroke:#000;stroke-width:5;\" /></g>\n        <g id=\"term-pitch-accent-graph-triangle\"><path d=\"M0 13 L15 -13 L-15 -13 Z\" style=\"fill:none;stroke:#000;stroke-width:5;\" /></g>\n    </defs>\n    <path style=\"fill:none;stroke:#000;stroke-width:5;\" d=\"M25 75L75 25L125 25L175 75\"></path>\n    <path style=\"fill:none;stroke:#000;stroke-width:5;stroke-dasharray:5 5;\" d=\"M175 75 L225 75\"></path>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"25\" y=\"75\"></use>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"75\" y=\"25\"></use>\n    <use href=\"#term-pitch-accent-graph-dot-downstep\" x=\"125\" y=\"25\"></use>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"175\" y=\"75\"></use>\n    <use href=\"#term-pitch-accent-graph-triangle\" x=\"225\" y=\"75\"></use>\n</svg></li></ol>",
@@ -397,7 +397,7 @@
         "screenshot": "<img src=\"\" />",
         "search-query": "fullQuery",
         "sentence": "cloze-prefix打ち込むcloze-suffix",
-        "tags": "tag1, tag2",
+        "tags": "vt",
         "url": "<a href=\"url:\">url:</a>"
       },
       {
@@ -414,9 +414,9 @@
         "frequencies": "<ul style=\"text-align: left;\"><li>Test Dictionary 2: 2</li><li>Test Dictionary 2: 6</li></ul>",
         "furigana": "<ruby>打<rt>う</rt></ruby>つ",
         "furigana-plain": "打[う]つ",
-        "glossary": "<div style=\"text-align: left;\"><i>(tag1, tag2, Test Dictionary 2)</i> <ul><li>definition5</li><li>definition6</li></ul></div>",
-        "glossary-brief": "<div style=\"text-align: left;\"><ul><li>definition5</li><li>definition6</li></ul></div>",
-        "glossary-no-dictionary": "<div style=\"text-align: left;\"><i>(tag1, tag2)</i> <ul><li>definition5</li><li>definition6</li></ul></div>",
+        "glossary": "<div style=\"text-align: left;\"><i>(vt, Test Dictionary 2)</i> <ul><li>utsu definition 1</li><li>utsu definition 2</li></ul></div>",
+        "glossary-brief": "<div style=\"text-align: left;\"><ul><li>utsu definition 1</li><li>utsu definition 2</li></ul></div>",
+        "glossary-no-dictionary": "<div style=\"text-align: left;\"><i>(vt)</i> <ul><li>utsu definition 1</li><li>utsu definition 2</li></ul></div>",
         "part-of-speech": "Godan verb",
         "pitch-accents": "No pitch accent data",
         "pitch-accent-graphs": "No pitch accent data",
@@ -425,7 +425,7 @@
         "screenshot": "<img src=\"\" />",
         "search-query": "fullQuery",
         "sentence": "cloze-prefix打ちcloze-suffix",
-        "tags": "tag1, tag2",
+        "tags": "vt",
         "url": "<a href=\"url:\">url:</a>"
       },
       {
@@ -442,9 +442,9 @@
         "frequencies": "<ul style=\"text-align: left;\"><li>Test Dictionary 2: 2</li><li>Test Dictionary 2: 7</li></ul>",
         "furigana": "<ruby>打<rt>ぶ</rt></ruby>つ",
         "furigana-plain": "打[ぶ]つ",
-        "glossary": "<div style=\"text-align: left;\"><i>(tag1, tag2, Test Dictionary 2)</i> <ul><li>definition9</li><li>definition10</li></ul></div>",
-        "glossary-brief": "<div style=\"text-align: left;\"><ul><li>definition9</li><li>definition10</li></ul></div>",
-        "glossary-no-dictionary": "<div style=\"text-align: left;\"><i>(tag1, tag2)</i> <ul><li>definition9</li><li>definition10</li></ul></div>",
+        "glossary": "<div style=\"text-align: left;\"><i>(vt, Test Dictionary 2)</i> <ul><li>butsu definition 1</li><li>butsu definition 2</li></ul></div>",
+        "glossary-brief": "<div style=\"text-align: left;\"><ul><li>butsu definition 1</li><li>butsu definition 2</li></ul></div>",
+        "glossary-no-dictionary": "<div style=\"text-align: left;\"><i>(vt)</i> <ul><li>butsu definition 1</li><li>butsu definition 2</li></ul></div>",
         "part-of-speech": "Godan verb",
         "pitch-accents": "No pitch accent data",
         "pitch-accent-graphs": "No pitch accent data",
@@ -453,7 +453,7 @@
         "screenshot": "<img src=\"\" />",
         "search-query": "fullQuery",
         "sentence": "cloze-prefix打ちcloze-suffix",
-        "tags": "tag1, tag2",
+        "tags": "vt",
         "url": "<a href=\"url:\">url:</a>"
       },
       {
@@ -470,9 +470,9 @@
         "frequencies": "<ul style=\"text-align: left;\"><li>Test Dictionary 2: 2</li><li>Test Dictionary 2: 6</li></ul>",
         "furigana": "<ruby>打<rt>う</rt></ruby>つ",
         "furigana-plain": "打[う]つ",
-        "glossary": "<div style=\"text-align: left;\"><i>(tag1, tag2, Test Dictionary 2)</i> <ul><li>definition7</li><li>definition8</li></ul></div>",
-        "glossary-brief": "<div style=\"text-align: left;\"><ul><li>definition7</li><li>definition8</li></ul></div>",
-        "glossary-no-dictionary": "<div style=\"text-align: left;\"><i>(tag1, tag2)</i> <ul><li>definition7</li><li>definition8</li></ul></div>",
+        "glossary": "<div style=\"text-align: left;\"><i>(vt, Test Dictionary 2)</i> <ul><li>utsu definition 3</li><li>utsu definition 4</li></ul></div>",
+        "glossary-brief": "<div style=\"text-align: left;\"><ul><li>utsu definition 3</li><li>utsu definition 4</li></ul></div>",
+        "glossary-no-dictionary": "<div style=\"text-align: left;\"><i>(vt)</i> <ul><li>utsu definition 3</li><li>utsu definition 4</li></ul></div>",
         "part-of-speech": "Godan verb",
         "pitch-accents": "No pitch accent data",
         "pitch-accent-graphs": "No pitch accent data",
@@ -481,7 +481,7 @@
         "screenshot": "<img src=\"\" />",
         "search-query": "fullQuery",
         "sentence": "cloze-prefix打ちcloze-suffix",
-        "tags": "tag1, tag2",
+        "tags": "vt",
         "url": "<a href=\"url:\">url:</a>"
       },
       {
@@ -498,9 +498,9 @@
         "frequencies": "<ul style=\"text-align: left;\"><li>Test Dictionary 2: 2</li><li>Test Dictionary 2: 7</li></ul>",
         "furigana": "<ruby>打<rt>ぶ</rt></ruby>つ",
         "furigana-plain": "打[ぶ]つ",
-        "glossary": "<div style=\"text-align: left;\"><i>(tag1, tag2, Test Dictionary 2)</i> <ul><li>definition11</li><li>definition12</li></ul></div>",
-        "glossary-brief": "<div style=\"text-align: left;\"><ul><li>definition11</li><li>definition12</li></ul></div>",
-        "glossary-no-dictionary": "<div style=\"text-align: left;\"><i>(tag1, tag2)</i> <ul><li>definition11</li><li>definition12</li></ul></div>",
+        "glossary": "<div style=\"text-align: left;\"><i>(vt, Test Dictionary 2)</i> <ul><li>butsu definition 3</li><li>butsu definition 4</li></ul></div>",
+        "glossary-brief": "<div style=\"text-align: left;\"><ul><li>butsu definition 3</li><li>butsu definition 4</li></ul></div>",
+        "glossary-no-dictionary": "<div style=\"text-align: left;\"><i>(vt)</i> <ul><li>butsu definition 3</li><li>butsu definition 4</li></ul></div>",
         "part-of-speech": "Godan verb",
         "pitch-accents": "No pitch accent data",
         "pitch-accent-graphs": "No pitch accent data",
@@ -509,7 +509,7 @@
         "screenshot": "<img src=\"\" />",
         "search-query": "fullQuery",
         "sentence": "cloze-prefix打ちcloze-suffix",
-        "tags": "tag1, tag2",
+        "tags": "vt",
         "url": "<a href=\"url:\">url:</a>"
       },
       {
@@ -526,10 +526,10 @@
         "frequencies": "<ul style=\"text-align: left;\"><li>Test Dictionary 2: 1</li><li>Test Dictionary 2: 4</li></ul>",
         "furigana": "<ruby>打<rt>だ</rt></ruby>",
         "furigana-plain": "打[だ]",
-        "glossary": "<div style=\"text-align: left;\"><i>(tag1, tag2, Test Dictionary 2)</i> <ul><li>definition1</li><li>definition2</li></ul></div>",
-        "glossary-brief": "<div style=\"text-align: left;\"><ul><li>definition1</li><li>definition2</li></ul></div>",
-        "glossary-no-dictionary": "<div style=\"text-align: left;\"><i>(tag1, tag2)</i> <ul><li>definition1</li><li>definition2</li></ul></div>",
-        "part-of-speech": "Unknown",
+        "glossary": "<div style=\"text-align: left;\"><i>(n, Test Dictionary 2)</i> <ul><li>da definition 1</li><li>da definition 2</li></ul></div>",
+        "glossary-brief": "<div style=\"text-align: left;\"><ul><li>da definition 1</li><li>da definition 2</li></ul></div>",
+        "glossary-no-dictionary": "<div style=\"text-align: left;\"><i>(n)</i> <ul><li>da definition 1</li><li>da definition 2</li></ul></div>",
+        "part-of-speech": "Noun",
         "pitch-accents": "No pitch accent data",
         "pitch-accent-graphs": "No pitch accent data",
         "pitch-accent-positions": "No pitch accent data",
@@ -537,7 +537,7 @@
         "screenshot": "<img src=\"\" />",
         "search-query": "fullQuery",
         "sentence": "cloze-prefix打cloze-suffix",
-        "tags": "tag1, tag2",
+        "tags": "n",
         "url": "<a href=\"url:\">url:</a>"
       },
       {
@@ -554,10 +554,10 @@
         "frequencies": "<ul style=\"text-align: left;\"><li>Test Dictionary 2: 1</li><li>Test Dictionary 2: 5</li></ul>",
         "furigana": "<ruby>打<rt>ダース</rt></ruby>",
         "furigana-plain": "打[ダース]",
-        "glossary": "<div style=\"text-align: left;\"><i>(tag1, tag2, Test Dictionary 2)</i> <ul><li>definition3</li><li>definition4</li></ul></div>",
-        "glossary-brief": "<div style=\"text-align: left;\"><ul><li>definition3</li><li>definition4</li></ul></div>",
-        "glossary-no-dictionary": "<div style=\"text-align: left;\"><i>(tag1, tag2)</i> <ul><li>definition3</li><li>definition4</li></ul></div>",
-        "part-of-speech": "Unknown",
+        "glossary": "<div style=\"text-align: left;\"><i>(abbr, n, Test Dictionary 2)</i> <ul><li>daasu definition 1</li><li>daasu definition 2</li></ul></div>",
+        "glossary-brief": "<div style=\"text-align: left;\"><ul><li>daasu definition 1</li><li>daasu definition 2</li></ul></div>",
+        "glossary-no-dictionary": "<div style=\"text-align: left;\"><i>(abbr, n)</i> <ul><li>daasu definition 1</li><li>daasu definition 2</li></ul></div>",
+        "part-of-speech": "Noun",
         "pitch-accents": "No pitch accent data",
         "pitch-accent-graphs": "No pitch accent data",
         "pitch-accent-positions": "No pitch accent data",
@@ -565,7 +565,7 @@
         "screenshot": "<img src=\"\" />",
         "search-query": "fullQuery",
         "sentence": "cloze-prefix打cloze-suffix",
-        "tags": "tag1, tag2",
+        "tags": "abbr, n",
         "url": "<a href=\"url:\">url:</a>"
       }
     ]
@@ -587,10 +587,10 @@
         "frequencies": "",
         "furigana": "<ruby>画像<rt>がぞう</rt></ruby>",
         "furigana-plain": "画像[がぞう]",
-        "glossary": "<div style=\"text-align: left;\"><i>(tag1, tag2, Test Dictionary 2)</i> <ul><li>definition21</li><li>[object Object]</li></ul></div>",
-        "glossary-brief": "<div style=\"text-align: left;\"><ul><li>definition21</li><li>[object Object]</li></ul></div>",
-        "glossary-no-dictionary": "<div style=\"text-align: left;\"><i>(tag1, tag2)</i> <ul><li>definition21</li><li>[object Object]</li></ul></div>",
-        "part-of-speech": "Unknown",
+        "glossary": "<div style=\"text-align: left;\"><i>(n, Test Dictionary 2)</i> <ul><li>gazou definition 1</li><li>[object Object]</li></ul></div>",
+        "glossary-brief": "<div style=\"text-align: left;\"><ul><li>gazou definition 1</li><li>[object Object]</li></ul></div>",
+        "glossary-no-dictionary": "<div style=\"text-align: left;\"><i>(n)</i> <ul><li>gazou definition 1</li><li>[object Object]</li></ul></div>",
+        "part-of-speech": "Noun",
         "pitch-accents": "No pitch accent data",
         "pitch-accent-graphs": "No pitch accent data",
         "pitch-accent-positions": "No pitch accent data",
@@ -598,7 +598,7 @@
         "screenshot": "<img src=\"\" />",
         "search-query": "fullQuery",
         "sentence": "cloze-prefix画像cloze-suffix",
-        "tags": "tag1, tag2",
+        "tags": "n",
         "url": "<a href=\"url:\">url:</a>"
       }
     ]
@@ -620,10 +620,10 @@
         "frequencies": "<ul style=\"text-align: left;\"><li>Test Dictionary 2: 1</li><li>Test Dictionary 2: 4</li></ul>",
         "furigana": "<ruby>打<rt>だ</rt></ruby>",
         "furigana-plain": "打[だ]",
-        "glossary": "<div style=\"text-align: left;\"><i>(tag1, tag2, Test Dictionary 2)</i> <ul><li>definition1</li><li>definition2</li></ul></div>",
-        "glossary-brief": "<div style=\"text-align: left;\"><ul><li>definition1</li><li>definition2</li></ul></div>",
-        "glossary-no-dictionary": "<div style=\"text-align: left;\"><i>(tag1, tag2)</i> <ul><li>definition1</li><li>definition2</li></ul></div>",
-        "part-of-speech": "Unknown",
+        "glossary": "<div style=\"text-align: left;\"><i>(n, Test Dictionary 2)</i> <ul><li>da definition 1</li><li>da definition 2</li></ul></div>",
+        "glossary-brief": "<div style=\"text-align: left;\"><ul><li>da definition 1</li><li>da definition 2</li></ul></div>",
+        "glossary-no-dictionary": "<div style=\"text-align: left;\"><i>(n)</i> <ul><li>da definition 1</li><li>da definition 2</li></ul></div>",
+        "part-of-speech": "Noun",
         "pitch-accents": "No pitch accent data",
         "pitch-accent-graphs": "No pitch accent data",
         "pitch-accent-positions": "No pitch accent data",
@@ -631,7 +631,7 @@
         "screenshot": "<img src=\"\" />",
         "search-query": "fullQuery",
         "sentence": "cloze-prefixだcloze-suffix",
-        "tags": "tag1, tag2",
+        "tags": "n",
         "url": "<a href=\"url:\">url:</a>"
       }
     ]
@@ -653,10 +653,10 @@
         "frequencies": "<ul style=\"text-align: left;\"><li>Test Dictionary 2: 1</li><li>Test Dictionary 2: 5</li></ul>",
         "furigana": "<ruby>打<rt>ダース</rt></ruby>",
         "furigana-plain": "打[ダース]",
-        "glossary": "<div style=\"text-align: left;\"><i>(tag1, tag2, Test Dictionary 2)</i> <ul><li>definition3</li><li>definition4</li></ul></div>",
-        "glossary-brief": "<div style=\"text-align: left;\"><ul><li>definition3</li><li>definition4</li></ul></div>",
-        "glossary-no-dictionary": "<div style=\"text-align: left;\"><i>(tag1, tag2)</i> <ul><li>definition3</li><li>definition4</li></ul></div>",
-        "part-of-speech": "Unknown",
+        "glossary": "<div style=\"text-align: left;\"><i>(abbr, n, Test Dictionary 2)</i> <ul><li>daasu definition 1</li><li>daasu definition 2</li></ul></div>",
+        "glossary-brief": "<div style=\"text-align: left;\"><ul><li>daasu definition 1</li><li>daasu definition 2</li></ul></div>",
+        "glossary-no-dictionary": "<div style=\"text-align: left;\"><i>(abbr, n)</i> <ul><li>daasu definition 1</li><li>daasu definition 2</li></ul></div>",
+        "part-of-speech": "Noun",
         "pitch-accents": "No pitch accent data",
         "pitch-accent-graphs": "No pitch accent data",
         "pitch-accent-positions": "No pitch accent data",
@@ -664,7 +664,7 @@
         "screenshot": "<img src=\"\" />",
         "search-query": "fullQuery",
         "sentence": "cloze-prefixダースcloze-suffix",
-        "tags": "tag1, tag2",
+        "tags": "abbr, n",
         "url": "<a href=\"url:\">url:</a>"
       }
     ]
@@ -686,9 +686,9 @@
         "frequencies": "<ul style=\"text-align: left;\"><li>Test Dictionary 2: 2</li><li>Test Dictionary 2: 6</li></ul>",
         "furigana": "<ruby>打<rt>う</rt></ruby>つ",
         "furigana-plain": "打[う]つ",
-        "glossary": "<div style=\"text-align: left;\"><i>(tag1, tag2, Test Dictionary 2)</i> <ul><li>definition5</li><li>definition6</li></ul></div>",
-        "glossary-brief": "<div style=\"text-align: left;\"><ul><li>definition5</li><li>definition6</li></ul></div>",
-        "glossary-no-dictionary": "<div style=\"text-align: left;\"><i>(tag1, tag2)</i> <ul><li>definition5</li><li>definition6</li></ul></div>",
+        "glossary": "<div style=\"text-align: left;\"><i>(vt, Test Dictionary 2)</i> <ul><li>utsu definition 1</li><li>utsu definition 2</li></ul></div>",
+        "glossary-brief": "<div style=\"text-align: left;\"><ul><li>utsu definition 1</li><li>utsu definition 2</li></ul></div>",
+        "glossary-no-dictionary": "<div style=\"text-align: left;\"><i>(vt)</i> <ul><li>utsu definition 1</li><li>utsu definition 2</li></ul></div>",
         "part-of-speech": "Godan verb",
         "pitch-accents": "No pitch accent data",
         "pitch-accent-graphs": "No pitch accent data",
@@ -697,7 +697,7 @@
         "screenshot": "<img src=\"\" />",
         "search-query": "fullQuery",
         "sentence": "cloze-prefixうつcloze-suffix",
-        "tags": "tag1, tag2",
+        "tags": "vt",
         "url": "<a href=\"url:\">url:</a>"
       },
       {
@@ -714,9 +714,9 @@
         "frequencies": "<ul style=\"text-align: left;\"><li>Test Dictionary 2: 2</li><li>Test Dictionary 2: 6</li></ul>",
         "furigana": "<ruby>打<rt>う</rt></ruby>つ",
         "furigana-plain": "打[う]つ",
-        "glossary": "<div style=\"text-align: left;\"><i>(tag1, tag2, Test Dictionary 2)</i> <ul><li>definition7</li><li>definition8</li></ul></div>",
-        "glossary-brief": "<div style=\"text-align: left;\"><ul><li>definition7</li><li>definition8</li></ul></div>",
-        "glossary-no-dictionary": "<div style=\"text-align: left;\"><i>(tag1, tag2)</i> <ul><li>definition7</li><li>definition8</li></ul></div>",
+        "glossary": "<div style=\"text-align: left;\"><i>(vt, Test Dictionary 2)</i> <ul><li>utsu definition 3</li><li>utsu definition 4</li></ul></div>",
+        "glossary-brief": "<div style=\"text-align: left;\"><ul><li>utsu definition 3</li><li>utsu definition 4</li></ul></div>",
+        "glossary-no-dictionary": "<div style=\"text-align: left;\"><i>(vt)</i> <ul><li>utsu definition 3</li><li>utsu definition 4</li></ul></div>",
         "part-of-speech": "Godan verb",
         "pitch-accents": "No pitch accent data",
         "pitch-accent-graphs": "No pitch accent data",
@@ -725,7 +725,7 @@
         "screenshot": "<img src=\"\" />",
         "search-query": "fullQuery",
         "sentence": "cloze-prefixうつcloze-suffix",
-        "tags": "tag1, tag2",
+        "tags": "vt",
         "url": "<a href=\"url:\">url:</a>"
       }
     ]
@@ -747,9 +747,9 @@
         "frequencies": "<ul style=\"text-align: left;\"><li>Test Dictionary 2: 2</li><li>Test Dictionary 2: 7</li></ul>",
         "furigana": "<ruby>打<rt>ぶ</rt></ruby>つ",
         "furigana-plain": "打[ぶ]つ",
-        "glossary": "<div style=\"text-align: left;\"><i>(tag1, tag2, Test Dictionary 2)</i> <ul><li>definition9</li><li>definition10</li></ul></div>",
-        "glossary-brief": "<div style=\"text-align: left;\"><ul><li>definition9</li><li>definition10</li></ul></div>",
-        "glossary-no-dictionary": "<div style=\"text-align: left;\"><i>(tag1, tag2)</i> <ul><li>definition9</li><li>definition10</li></ul></div>",
+        "glossary": "<div style=\"text-align: left;\"><i>(vt, Test Dictionary 2)</i> <ul><li>butsu definition 1</li><li>butsu definition 2</li></ul></div>",
+        "glossary-brief": "<div style=\"text-align: left;\"><ul><li>butsu definition 1</li><li>butsu definition 2</li></ul></div>",
+        "glossary-no-dictionary": "<div style=\"text-align: left;\"><i>(vt)</i> <ul><li>butsu definition 1</li><li>butsu definition 2</li></ul></div>",
         "part-of-speech": "Godan verb",
         "pitch-accents": "No pitch accent data",
         "pitch-accent-graphs": "No pitch accent data",
@@ -758,7 +758,7 @@
         "screenshot": "<img src=\"\" />",
         "search-query": "fullQuery",
         "sentence": "cloze-prefixぶつcloze-suffix",
-        "tags": "tag1, tag2",
+        "tags": "vt",
         "url": "<a href=\"url:\">url:</a>"
       },
       {
@@ -775,9 +775,9 @@
         "frequencies": "<ul style=\"text-align: left;\"><li>Test Dictionary 2: 2</li><li>Test Dictionary 2: 7</li></ul>",
         "furigana": "<ruby>打<rt>ぶ</rt></ruby>つ",
         "furigana-plain": "打[ぶ]つ",
-        "glossary": "<div style=\"text-align: left;\"><i>(tag1, tag2, Test Dictionary 2)</i> <ul><li>definition11</li><li>definition12</li></ul></div>",
-        "glossary-brief": "<div style=\"text-align: left;\"><ul><li>definition11</li><li>definition12</li></ul></div>",
-        "glossary-no-dictionary": "<div style=\"text-align: left;\"><i>(tag1, tag2)</i> <ul><li>definition11</li><li>definition12</li></ul></div>",
+        "glossary": "<div style=\"text-align: left;\"><i>(vt, Test Dictionary 2)</i> <ul><li>butsu definition 3</li><li>butsu definition 4</li></ul></div>",
+        "glossary-brief": "<div style=\"text-align: left;\"><ul><li>butsu definition 3</li><li>butsu definition 4</li></ul></div>",
+        "glossary-no-dictionary": "<div style=\"text-align: left;\"><i>(vt)</i> <ul><li>butsu definition 3</li><li>butsu definition 4</li></ul></div>",
         "part-of-speech": "Godan verb",
         "pitch-accents": "No pitch accent data",
         "pitch-accent-graphs": "No pitch accent data",
@@ -786,7 +786,7 @@
         "screenshot": "<img src=\"\" />",
         "search-query": "fullQuery",
         "sentence": "cloze-prefixぶつcloze-suffix",
-        "tags": "tag1, tag2",
+        "tags": "vt",
         "url": "<a href=\"url:\">url:</a>"
       }
     ]
@@ -808,9 +808,9 @@
         "frequencies": "<ul style=\"text-align: left;\"><li>Test Dictionary 2: 3</li><li>Test Dictionary 2: 8</li></ul>",
         "furigana": "<ruby>打<rt>う</rt></ruby>ち<ruby>込<rt>こ</rt></ruby>む",
         "furigana-plain": "打[う]ち 込[こ]む",
-        "glossary": "<div style=\"text-align: left;\"><i>(tag1, tag2, Test Dictionary 2)</i> <ul><li>definition13</li><li>definition14</li></ul></div>",
-        "glossary-brief": "<div style=\"text-align: left;\"><ul><li>definition13</li><li>definition14</li></ul></div>",
-        "glossary-no-dictionary": "<div style=\"text-align: left;\"><i>(tag1, tag2)</i> <ul><li>definition13</li><li>definition14</li></ul></div>",
+        "glossary": "<div style=\"text-align: left;\"><i>(vt, Test Dictionary 2)</i> <ul><li>uchikomu definition 1</li><li>uchikomu definition 2</li></ul></div>",
+        "glossary-brief": "<div style=\"text-align: left;\"><ul><li>uchikomu definition 1</li><li>uchikomu definition 2</li></ul></div>",
+        "glossary-no-dictionary": "<div style=\"text-align: left;\"><i>(vt)</i> <ul><li>uchikomu definition 1</li><li>uchikomu definition 2</li></ul></div>",
         "part-of-speech": "Godan verb",
         "pitch-accents": "<ol><li><span><span style=\"display:inline-block;position:relative;\">う<span style=\"\"></span></span><span style=\"display:inline-block;position:relative;\">ち<span style=\"display:block;user-select:none;pointer-events:none;position:absolute;top:0.1em;left:0;right:0;height:0;border-top:0.1em solid;\"></span></span><span style=\"display:inline-block;position:relative;\">こ<span style=\"display:block;user-select:none;pointer-events:none;position:absolute;top:0.1em;left:0;right:0;height:0;border-top:0.1em solid;\"></span></span><span style=\"display:inline-block;position:relative;\">む<span style=\"display:block;user-select:none;pointer-events:none;position:absolute;top:0.1em;left:0;right:0;height:0;border-top:0.1em solid;\"></span></span></span></li><li><span><span style=\"display:inline-block;position:relative;\">う<span style=\"\"></span></span><span style=\"display:inline-block;position:relative;\">ち<span style=\"display:block;user-select:none;pointer-events:none;position:absolute;top:0.1em;left:0;right:0;height:0;border-top:0.1em solid;\"></span></span><span style=\"display:inline-block;position:relative;padding-right:0.1em;margin-right:0.1em;\">こ<span style=\"display:block;user-select:none;pointer-events:none;position:absolute;top:0.1em;left:0;right:0;height:0;border-top:0.1em solid;right:-0.1em;height:0.4em;border-right:0.1em solid;\"></span></span><span style=\"display:inline-block;position:relative;\">む<span style=\"\"></span></span></span></li></ol>",
         "pitch-accent-graphs": "<ol><li><svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 250 100\" style=\"display:inline-block;height:2em;\">\n    <defs>\n        <g id=\"term-pitch-accent-graph-dot\"><circle cx=\"0\" cy=\"0\" r=\"15\" style=\"fill:#000;stroke:#000;stroke-width:5;\" /></g>\n        <g id=\"term-pitch-accent-graph-dot-downstep\"><circle cx=\"0\" cy=\"0\" r=\"15\" style=\"fill:none;stroke:#000;stroke-width:5;\" /><circle cx=\"0\" cy=\"0\" r=\"5\" style=\"fill:none;stroke:#000;stroke-width:5;\" /></g>\n        <g id=\"term-pitch-accent-graph-triangle\"><path d=\"M0 13 L15 -13 L-15 -13 Z\" style=\"fill:none;stroke:#000;stroke-width:5;\" /></g>\n    </defs>\n    <path style=\"fill:none;stroke:#000;stroke-width:5;\" d=\"M25 75L75 25L125 25L175 25\"></path>\n    <path style=\"fill:none;stroke:#000;stroke-width:5;stroke-dasharray:5 5;\" d=\"M175 25 L225 25\"></path>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"25\" y=\"75\"></use>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"75\" y=\"25\"></use>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"125\" y=\"25\"></use>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"175\" y=\"25\"></use>\n    <use href=\"#term-pitch-accent-graph-triangle\" x=\"225\" y=\"25\"></use>\n</svg></li><li><svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 250 100\" style=\"display:inline-block;height:2em;\">\n    <defs>\n        <g id=\"term-pitch-accent-graph-dot\"><circle cx=\"0\" cy=\"0\" r=\"15\" style=\"fill:#000;stroke:#000;stroke-width:5;\" /></g>\n        <g id=\"term-pitch-accent-graph-dot-downstep\"><circle cx=\"0\" cy=\"0\" r=\"15\" style=\"fill:none;stroke:#000;stroke-width:5;\" /><circle cx=\"0\" cy=\"0\" r=\"5\" style=\"fill:none;stroke:#000;stroke-width:5;\" /></g>\n        <g id=\"term-pitch-accent-graph-triangle\"><path d=\"M0 13 L15 -13 L-15 -13 Z\" style=\"fill:none;stroke:#000;stroke-width:5;\" /></g>\n    </defs>\n    <path style=\"fill:none;stroke:#000;stroke-width:5;\" d=\"M25 75L75 25L125 25L175 75\"></path>\n    <path style=\"fill:none;stroke:#000;stroke-width:5;stroke-dasharray:5 5;\" d=\"M175 75 L225 75\"></path>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"25\" y=\"75\"></use>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"75\" y=\"25\"></use>\n    <use href=\"#term-pitch-accent-graph-dot-downstep\" x=\"125\" y=\"25\"></use>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"175\" y=\"75\"></use>\n    <use href=\"#term-pitch-accent-graph-triangle\" x=\"225\" y=\"75\"></use>\n</svg></li></ol>",
@@ -819,7 +819,7 @@
         "screenshot": "<img src=\"\" />",
         "search-query": "fullQuery",
         "sentence": "cloze-prefixうちこむcloze-suffix",
-        "tags": "tag1, tag2",
+        "tags": "vt",
         "url": "<a href=\"url:\">url:</a>"
       },
       {
@@ -836,9 +836,9 @@
         "frequencies": "<ul style=\"text-align: left;\"><li>Test Dictionary 2: 3</li><li>Test Dictionary 2: 8</li></ul>",
         "furigana": "<ruby>打<rt>う</rt></ruby>ち<ruby>込<rt>こ</rt></ruby>む",
         "furigana-plain": "打[う]ち 込[こ]む",
-        "glossary": "<div style=\"text-align: left;\"><i>(tag1, tag2, Test Dictionary 2)</i> <ul><li>definition15</li><li>definition16</li></ul></div>",
-        "glossary-brief": "<div style=\"text-align: left;\"><ul><li>definition15</li><li>definition16</li></ul></div>",
-        "glossary-no-dictionary": "<div style=\"text-align: left;\"><i>(tag1, tag2)</i> <ul><li>definition15</li><li>definition16</li></ul></div>",
+        "glossary": "<div style=\"text-align: left;\"><i>(vt, Test Dictionary 2)</i> <ul><li>uchikomu definition 3</li><li>uchikomu definition 4</li></ul></div>",
+        "glossary-brief": "<div style=\"text-align: left;\"><ul><li>uchikomu definition 3</li><li>uchikomu definition 4</li></ul></div>",
+        "glossary-no-dictionary": "<div style=\"text-align: left;\"><i>(vt)</i> <ul><li>uchikomu definition 3</li><li>uchikomu definition 4</li></ul></div>",
         "part-of-speech": "Godan verb",
         "pitch-accents": "<ol><li><span><span style=\"display:inline-block;position:relative;\">う<span style=\"\"></span></span><span style=\"display:inline-block;position:relative;\">ち<span style=\"display:block;user-select:none;pointer-events:none;position:absolute;top:0.1em;left:0;right:0;height:0;border-top:0.1em solid;\"></span></span><span style=\"display:inline-block;position:relative;\">こ<span style=\"display:block;user-select:none;pointer-events:none;position:absolute;top:0.1em;left:0;right:0;height:0;border-top:0.1em solid;\"></span></span><span style=\"display:inline-block;position:relative;\">む<span style=\"display:block;user-select:none;pointer-events:none;position:absolute;top:0.1em;left:0;right:0;height:0;border-top:0.1em solid;\"></span></span></span></li><li><span><span style=\"display:inline-block;position:relative;\">う<span style=\"\"></span></span><span style=\"display:inline-block;position:relative;\">ち<span style=\"display:block;user-select:none;pointer-events:none;position:absolute;top:0.1em;left:0;right:0;height:0;border-top:0.1em solid;\"></span></span><span style=\"display:inline-block;position:relative;padding-right:0.1em;margin-right:0.1em;\">こ<span style=\"display:block;user-select:none;pointer-events:none;position:absolute;top:0.1em;left:0;right:0;height:0;border-top:0.1em solid;right:-0.1em;height:0.4em;border-right:0.1em solid;\"></span></span><span style=\"display:inline-block;position:relative;\">む<span style=\"\"></span></span></span></li></ol>",
         "pitch-accent-graphs": "<ol><li><svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 250 100\" style=\"display:inline-block;height:2em;\">\n    <defs>\n        <g id=\"term-pitch-accent-graph-dot\"><circle cx=\"0\" cy=\"0\" r=\"15\" style=\"fill:#000;stroke:#000;stroke-width:5;\" /></g>\n        <g id=\"term-pitch-accent-graph-dot-downstep\"><circle cx=\"0\" cy=\"0\" r=\"15\" style=\"fill:none;stroke:#000;stroke-width:5;\" /><circle cx=\"0\" cy=\"0\" r=\"5\" style=\"fill:none;stroke:#000;stroke-width:5;\" /></g>\n        <g id=\"term-pitch-accent-graph-triangle\"><path d=\"M0 13 L15 -13 L-15 -13 Z\" style=\"fill:none;stroke:#000;stroke-width:5;\" /></g>\n    </defs>\n    <path style=\"fill:none;stroke:#000;stroke-width:5;\" d=\"M25 75L75 25L125 25L175 25\"></path>\n    <path style=\"fill:none;stroke:#000;stroke-width:5;stroke-dasharray:5 5;\" d=\"M175 25 L225 25\"></path>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"25\" y=\"75\"></use>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"75\" y=\"25\"></use>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"125\" y=\"25\"></use>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"175\" y=\"25\"></use>\n    <use href=\"#term-pitch-accent-graph-triangle\" x=\"225\" y=\"25\"></use>\n</svg></li><li><svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 250 100\" style=\"display:inline-block;height:2em;\">\n    <defs>\n        <g id=\"term-pitch-accent-graph-dot\"><circle cx=\"0\" cy=\"0\" r=\"15\" style=\"fill:#000;stroke:#000;stroke-width:5;\" /></g>\n        <g id=\"term-pitch-accent-graph-dot-downstep\"><circle cx=\"0\" cy=\"0\" r=\"15\" style=\"fill:none;stroke:#000;stroke-width:5;\" /><circle cx=\"0\" cy=\"0\" r=\"5\" style=\"fill:none;stroke:#000;stroke-width:5;\" /></g>\n        <g id=\"term-pitch-accent-graph-triangle\"><path d=\"M0 13 L15 -13 L-15 -13 Z\" style=\"fill:none;stroke:#000;stroke-width:5;\" /></g>\n    </defs>\n    <path style=\"fill:none;stroke:#000;stroke-width:5;\" d=\"M25 75L75 25L125 25L175 75\"></path>\n    <path style=\"fill:none;stroke:#000;stroke-width:5;stroke-dasharray:5 5;\" d=\"M175 75 L225 75\"></path>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"25\" y=\"75\"></use>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"75\" y=\"25\"></use>\n    <use href=\"#term-pitch-accent-graph-dot-downstep\" x=\"125\" y=\"25\"></use>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"175\" y=\"75\"></use>\n    <use href=\"#term-pitch-accent-graph-triangle\" x=\"225\" y=\"75\"></use>\n</svg></li></ol>",
@@ -847,7 +847,7 @@
         "screenshot": "<img src=\"\" />",
         "search-query": "fullQuery",
         "sentence": "cloze-prefixうちこむcloze-suffix",
-        "tags": "tag1, tag2",
+        "tags": "vt",
         "url": "<a href=\"url:\">url:</a>"
       },
       {
@@ -864,9 +864,9 @@
         "frequencies": "<ul style=\"text-align: left;\"><li>Test Dictionary 2: 2</li><li>Test Dictionary 2: 6</li></ul>",
         "furigana": "<ruby>打<rt>う</rt></ruby>つ",
         "furigana-plain": "打[う]つ",
-        "glossary": "<div style=\"text-align: left;\"><i>(tag1, tag2, Test Dictionary 2)</i> <ul><li>definition5</li><li>definition6</li></ul></div>",
-        "glossary-brief": "<div style=\"text-align: left;\"><ul><li>definition5</li><li>definition6</li></ul></div>",
-        "glossary-no-dictionary": "<div style=\"text-align: left;\"><i>(tag1, tag2)</i> <ul><li>definition5</li><li>definition6</li></ul></div>",
+        "glossary": "<div style=\"text-align: left;\"><i>(vt, Test Dictionary 2)</i> <ul><li>utsu definition 1</li><li>utsu definition 2</li></ul></div>",
+        "glossary-brief": "<div style=\"text-align: left;\"><ul><li>utsu definition 1</li><li>utsu definition 2</li></ul></div>",
+        "glossary-no-dictionary": "<div style=\"text-align: left;\"><i>(vt)</i> <ul><li>utsu definition 1</li><li>utsu definition 2</li></ul></div>",
         "part-of-speech": "Godan verb",
         "pitch-accents": "No pitch accent data",
         "pitch-accent-graphs": "No pitch accent data",
@@ -875,7 +875,7 @@
         "screenshot": "<img src=\"\" />",
         "search-query": "fullQuery",
         "sentence": "cloze-prefixうちcloze-suffix",
-        "tags": "tag1, tag2",
+        "tags": "vt",
         "url": "<a href=\"url:\">url:</a>"
       },
       {
@@ -892,9 +892,9 @@
         "frequencies": "<ul style=\"text-align: left;\"><li>Test Dictionary 2: 2</li><li>Test Dictionary 2: 6</li></ul>",
         "furigana": "<ruby>打<rt>う</rt></ruby>つ",
         "furigana-plain": "打[う]つ",
-        "glossary": "<div style=\"text-align: left;\"><i>(tag1, tag2, Test Dictionary 2)</i> <ul><li>definition7</li><li>definition8</li></ul></div>",
-        "glossary-brief": "<div style=\"text-align: left;\"><ul><li>definition7</li><li>definition8</li></ul></div>",
-        "glossary-no-dictionary": "<div style=\"text-align: left;\"><i>(tag1, tag2)</i> <ul><li>definition7</li><li>definition8</li></ul></div>",
+        "glossary": "<div style=\"text-align: left;\"><i>(vt, Test Dictionary 2)</i> <ul><li>utsu definition 3</li><li>utsu definition 4</li></ul></div>",
+        "glossary-brief": "<div style=\"text-align: left;\"><ul><li>utsu definition 3</li><li>utsu definition 4</li></ul></div>",
+        "glossary-no-dictionary": "<div style=\"text-align: left;\"><i>(vt)</i> <ul><li>utsu definition 3</li><li>utsu definition 4</li></ul></div>",
         "part-of-speech": "Godan verb",
         "pitch-accents": "No pitch accent data",
         "pitch-accent-graphs": "No pitch accent data",
@@ -903,7 +903,7 @@
         "screenshot": "<img src=\"\" />",
         "search-query": "fullQuery",
         "sentence": "cloze-prefixうちcloze-suffix",
-        "tags": "tag1, tag2",
+        "tags": "vt",
         "url": "<a href=\"url:\">url:</a>"
       }
     ]
@@ -925,9 +925,9 @@
         "frequencies": "<ul style=\"text-align: left;\"><li>Test Dictionary 2: 3</li><li>Test Dictionary 2: 9</li></ul>",
         "furigana": "<ruby>打<rt>ぶ</rt></ruby>ち<ruby>込<rt>こ</rt></ruby>む",
         "furigana-plain": "打[ぶ]ち 込[こ]む",
-        "glossary": "<div style=\"text-align: left;\"><i>(tag1, tag2, Test Dictionary 2)</i> <ul><li>definition17</li><li>definition18</li></ul></div>",
-        "glossary-brief": "<div style=\"text-align: left;\"><ul><li>definition17</li><li>definition18</li></ul></div>",
-        "glossary-no-dictionary": "<div style=\"text-align: left;\"><i>(tag1, tag2)</i> <ul><li>definition17</li><li>definition18</li></ul></div>",
+        "glossary": "<div style=\"text-align: left;\"><i>(vt, Test Dictionary 2)</i> <ul><li>buchikomu definition 1</li><li>buchikomu definition 2</li></ul></div>",
+        "glossary-brief": "<div style=\"text-align: left;\"><ul><li>buchikomu definition 1</li><li>buchikomu definition 2</li></ul></div>",
+        "glossary-no-dictionary": "<div style=\"text-align: left;\"><i>(vt)</i> <ul><li>buchikomu definition 1</li><li>buchikomu definition 2</li></ul></div>",
         "part-of-speech": "Godan verb",
         "pitch-accents": "<ol><li><span><span style=\"display:inline-block;position:relative;\">ぶ<span style=\"\"></span></span><span style=\"display:inline-block;position:relative;\">ち<span style=\"display:block;user-select:none;pointer-events:none;position:absolute;top:0.1em;left:0;right:0;height:0;border-top:0.1em solid;\"></span></span><span style=\"display:inline-block;position:relative;\">こ<span style=\"display:block;user-select:none;pointer-events:none;position:absolute;top:0.1em;left:0;right:0;height:0;border-top:0.1em solid;\"></span></span><span style=\"display:inline-block;position:relative;\">む<span style=\"display:block;user-select:none;pointer-events:none;position:absolute;top:0.1em;left:0;right:0;height:0;border-top:0.1em solid;\"></span></span></span></li><li><span><span style=\"display:inline-block;position:relative;\">ぶ<span style=\"\"></span></span><span style=\"display:inline-block;position:relative;\">ち<span style=\"display:block;user-select:none;pointer-events:none;position:absolute;top:0.1em;left:0;right:0;height:0;border-top:0.1em solid;\"></span></span><span style=\"display:inline-block;position:relative;padding-right:0.1em;margin-right:0.1em;\">こ<span style=\"display:block;user-select:none;pointer-events:none;position:absolute;top:0.1em;left:0;right:0;height:0;border-top:0.1em solid;right:-0.1em;height:0.4em;border-right:0.1em solid;\"></span></span><span style=\"display:inline-block;position:relative;\">む<span style=\"\"></span></span></span></li></ol>",
         "pitch-accent-graphs": "<ol><li><svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 250 100\" style=\"display:inline-block;height:2em;\">\n    <defs>\n        <g id=\"term-pitch-accent-graph-dot\"><circle cx=\"0\" cy=\"0\" r=\"15\" style=\"fill:#000;stroke:#000;stroke-width:5;\" /></g>\n        <g id=\"term-pitch-accent-graph-dot-downstep\"><circle cx=\"0\" cy=\"0\" r=\"15\" style=\"fill:none;stroke:#000;stroke-width:5;\" /><circle cx=\"0\" cy=\"0\" r=\"5\" style=\"fill:none;stroke:#000;stroke-width:5;\" /></g>\n        <g id=\"term-pitch-accent-graph-triangle\"><path d=\"M0 13 L15 -13 L-15 -13 Z\" style=\"fill:none;stroke:#000;stroke-width:5;\" /></g>\n    </defs>\n    <path style=\"fill:none;stroke:#000;stroke-width:5;\" d=\"M25 75L75 25L125 25L175 25\"></path>\n    <path style=\"fill:none;stroke:#000;stroke-width:5;stroke-dasharray:5 5;\" d=\"M175 25 L225 25\"></path>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"25\" y=\"75\"></use>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"75\" y=\"25\"></use>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"125\" y=\"25\"></use>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"175\" y=\"25\"></use>\n    <use href=\"#term-pitch-accent-graph-triangle\" x=\"225\" y=\"25\"></use>\n</svg></li><li><svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 250 100\" style=\"display:inline-block;height:2em;\">\n    <defs>\n        <g id=\"term-pitch-accent-graph-dot\"><circle cx=\"0\" cy=\"0\" r=\"15\" style=\"fill:#000;stroke:#000;stroke-width:5;\" /></g>\n        <g id=\"term-pitch-accent-graph-dot-downstep\"><circle cx=\"0\" cy=\"0\" r=\"15\" style=\"fill:none;stroke:#000;stroke-width:5;\" /><circle cx=\"0\" cy=\"0\" r=\"5\" style=\"fill:none;stroke:#000;stroke-width:5;\" /></g>\n        <g id=\"term-pitch-accent-graph-triangle\"><path d=\"M0 13 L15 -13 L-15 -13 Z\" style=\"fill:none;stroke:#000;stroke-width:5;\" /></g>\n    </defs>\n    <path style=\"fill:none;stroke:#000;stroke-width:5;\" d=\"M25 75L75 25L125 25L175 75\"></path>\n    <path style=\"fill:none;stroke:#000;stroke-width:5;stroke-dasharray:5 5;\" d=\"M175 75 L225 75\"></path>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"25\" y=\"75\"></use>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"75\" y=\"25\"></use>\n    <use href=\"#term-pitch-accent-graph-dot-downstep\" x=\"125\" y=\"25\"></use>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"175\" y=\"75\"></use>\n    <use href=\"#term-pitch-accent-graph-triangle\" x=\"225\" y=\"75\"></use>\n</svg></li></ol>",
@@ -936,7 +936,7 @@
         "screenshot": "<img src=\"\" />",
         "search-query": "fullQuery",
         "sentence": "cloze-prefixぶちこむcloze-suffix",
-        "tags": "tag1, tag2",
+        "tags": "vt",
         "url": "<a href=\"url:\">url:</a>"
       },
       {
@@ -953,9 +953,9 @@
         "frequencies": "<ul style=\"text-align: left;\"><li>Test Dictionary 2: 3</li><li>Test Dictionary 2: 9</li></ul>",
         "furigana": "<ruby>打<rt>ぶ</rt></ruby>ち<ruby>込<rt>こ</rt></ruby>む",
         "furigana-plain": "打[ぶ]ち 込[こ]む",
-        "glossary": "<div style=\"text-align: left;\"><i>(tag1, tag2, Test Dictionary 2)</i> <ul><li>definition19</li><li>definition20</li></ul></div>",
-        "glossary-brief": "<div style=\"text-align: left;\"><ul><li>definition19</li><li>definition20</li></ul></div>",
-        "glossary-no-dictionary": "<div style=\"text-align: left;\"><i>(tag1, tag2)</i> <ul><li>definition19</li><li>definition20</li></ul></div>",
+        "glossary": "<div style=\"text-align: left;\"><i>(vt, Test Dictionary 2)</i> <ul><li>buchikomu definition 3</li><li>buchikomu definition 4</li></ul></div>",
+        "glossary-brief": "<div style=\"text-align: left;\"><ul><li>buchikomu definition 3</li><li>buchikomu definition 4</li></ul></div>",
+        "glossary-no-dictionary": "<div style=\"text-align: left;\"><i>(vt)</i> <ul><li>buchikomu definition 3</li><li>buchikomu definition 4</li></ul></div>",
         "part-of-speech": "Godan verb",
         "pitch-accents": "<ol><li><span><span style=\"display:inline-block;position:relative;\">ぶ<span style=\"\"></span></span><span style=\"display:inline-block;position:relative;\">ち<span style=\"display:block;user-select:none;pointer-events:none;position:absolute;top:0.1em;left:0;right:0;height:0;border-top:0.1em solid;\"></span></span><span style=\"display:inline-block;position:relative;\">こ<span style=\"display:block;user-select:none;pointer-events:none;position:absolute;top:0.1em;left:0;right:0;height:0;border-top:0.1em solid;\"></span></span><span style=\"display:inline-block;position:relative;\">む<span style=\"display:block;user-select:none;pointer-events:none;position:absolute;top:0.1em;left:0;right:0;height:0;border-top:0.1em solid;\"></span></span></span></li><li><span><span style=\"display:inline-block;position:relative;\">ぶ<span style=\"\"></span></span><span style=\"display:inline-block;position:relative;\">ち<span style=\"display:block;user-select:none;pointer-events:none;position:absolute;top:0.1em;left:0;right:0;height:0;border-top:0.1em solid;\"></span></span><span style=\"display:inline-block;position:relative;padding-right:0.1em;margin-right:0.1em;\">こ<span style=\"display:block;user-select:none;pointer-events:none;position:absolute;top:0.1em;left:0;right:0;height:0;border-top:0.1em solid;right:-0.1em;height:0.4em;border-right:0.1em solid;\"></span></span><span style=\"display:inline-block;position:relative;\">む<span style=\"\"></span></span></span></li></ol>",
         "pitch-accent-graphs": "<ol><li><svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 250 100\" style=\"display:inline-block;height:2em;\">\n    <defs>\n        <g id=\"term-pitch-accent-graph-dot\"><circle cx=\"0\" cy=\"0\" r=\"15\" style=\"fill:#000;stroke:#000;stroke-width:5;\" /></g>\n        <g id=\"term-pitch-accent-graph-dot-downstep\"><circle cx=\"0\" cy=\"0\" r=\"15\" style=\"fill:none;stroke:#000;stroke-width:5;\" /><circle cx=\"0\" cy=\"0\" r=\"5\" style=\"fill:none;stroke:#000;stroke-width:5;\" /></g>\n        <g id=\"term-pitch-accent-graph-triangle\"><path d=\"M0 13 L15 -13 L-15 -13 Z\" style=\"fill:none;stroke:#000;stroke-width:5;\" /></g>\n    </defs>\n    <path style=\"fill:none;stroke:#000;stroke-width:5;\" d=\"M25 75L75 25L125 25L175 25\"></path>\n    <path style=\"fill:none;stroke:#000;stroke-width:5;stroke-dasharray:5 5;\" d=\"M175 25 L225 25\"></path>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"25\" y=\"75\"></use>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"75\" y=\"25\"></use>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"125\" y=\"25\"></use>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"175\" y=\"25\"></use>\n    <use href=\"#term-pitch-accent-graph-triangle\" x=\"225\" y=\"25\"></use>\n</svg></li><li><svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 250 100\" style=\"display:inline-block;height:2em;\">\n    <defs>\n        <g id=\"term-pitch-accent-graph-dot\"><circle cx=\"0\" cy=\"0\" r=\"15\" style=\"fill:#000;stroke:#000;stroke-width:5;\" /></g>\n        <g id=\"term-pitch-accent-graph-dot-downstep\"><circle cx=\"0\" cy=\"0\" r=\"15\" style=\"fill:none;stroke:#000;stroke-width:5;\" /><circle cx=\"0\" cy=\"0\" r=\"5\" style=\"fill:none;stroke:#000;stroke-width:5;\" /></g>\n        <g id=\"term-pitch-accent-graph-triangle\"><path d=\"M0 13 L15 -13 L-15 -13 Z\" style=\"fill:none;stroke:#000;stroke-width:5;\" /></g>\n    </defs>\n    <path style=\"fill:none;stroke:#000;stroke-width:5;\" d=\"M25 75L75 25L125 25L175 75\"></path>\n    <path style=\"fill:none;stroke:#000;stroke-width:5;stroke-dasharray:5 5;\" d=\"M175 75 L225 75\"></path>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"25\" y=\"75\"></use>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"75\" y=\"25\"></use>\n    <use href=\"#term-pitch-accent-graph-dot-downstep\" x=\"125\" y=\"25\"></use>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"175\" y=\"75\"></use>\n    <use href=\"#term-pitch-accent-graph-triangle\" x=\"225\" y=\"75\"></use>\n</svg></li></ol>",
@@ -964,7 +964,7 @@
         "screenshot": "<img src=\"\" />",
         "search-query": "fullQuery",
         "sentence": "cloze-prefixぶちこむcloze-suffix",
-        "tags": "tag1, tag2",
+        "tags": "vt",
         "url": "<a href=\"url:\">url:</a>"
       },
       {
@@ -981,9 +981,9 @@
         "frequencies": "<ul style=\"text-align: left;\"><li>Test Dictionary 2: 2</li><li>Test Dictionary 2: 7</li></ul>",
         "furigana": "<ruby>打<rt>ぶ</rt></ruby>つ",
         "furigana-plain": "打[ぶ]つ",
-        "glossary": "<div style=\"text-align: left;\"><i>(tag1, tag2, Test Dictionary 2)</i> <ul><li>definition9</li><li>definition10</li></ul></div>",
-        "glossary-brief": "<div style=\"text-align: left;\"><ul><li>definition9</li><li>definition10</li></ul></div>",
-        "glossary-no-dictionary": "<div style=\"text-align: left;\"><i>(tag1, tag2)</i> <ul><li>definition9</li><li>definition10</li></ul></div>",
+        "glossary": "<div style=\"text-align: left;\"><i>(vt, Test Dictionary 2)</i> <ul><li>butsu definition 1</li><li>butsu definition 2</li></ul></div>",
+        "glossary-brief": "<div style=\"text-align: left;\"><ul><li>butsu definition 1</li><li>butsu definition 2</li></ul></div>",
+        "glossary-no-dictionary": "<div style=\"text-align: left;\"><i>(vt)</i> <ul><li>butsu definition 1</li><li>butsu definition 2</li></ul></div>",
         "part-of-speech": "Godan verb",
         "pitch-accents": "No pitch accent data",
         "pitch-accent-graphs": "No pitch accent data",
@@ -992,7 +992,7 @@
         "screenshot": "<img src=\"\" />",
         "search-query": "fullQuery",
         "sentence": "cloze-prefixぶちcloze-suffix",
-        "tags": "tag1, tag2",
+        "tags": "vt",
         "url": "<a href=\"url:\">url:</a>"
       },
       {
@@ -1009,9 +1009,9 @@
         "frequencies": "<ul style=\"text-align: left;\"><li>Test Dictionary 2: 2</li><li>Test Dictionary 2: 7</li></ul>",
         "furigana": "<ruby>打<rt>ぶ</rt></ruby>つ",
         "furigana-plain": "打[ぶ]つ",
-        "glossary": "<div style=\"text-align: left;\"><i>(tag1, tag2, Test Dictionary 2)</i> <ul><li>definition11</li><li>definition12</li></ul></div>",
-        "glossary-brief": "<div style=\"text-align: left;\"><ul><li>definition11</li><li>definition12</li></ul></div>",
-        "glossary-no-dictionary": "<div style=\"text-align: left;\"><i>(tag1, tag2)</i> <ul><li>definition11</li><li>definition12</li></ul></div>",
+        "glossary": "<div style=\"text-align: left;\"><i>(vt, Test Dictionary 2)</i> <ul><li>butsu definition 3</li><li>butsu definition 4</li></ul></div>",
+        "glossary-brief": "<div style=\"text-align: left;\"><ul><li>butsu definition 3</li><li>butsu definition 4</li></ul></div>",
+        "glossary-no-dictionary": "<div style=\"text-align: left;\"><i>(vt)</i> <ul><li>butsu definition 3</li><li>butsu definition 4</li></ul></div>",
         "part-of-speech": "Godan verb",
         "pitch-accents": "No pitch accent data",
         "pitch-accent-graphs": "No pitch accent data",
@@ -1020,7 +1020,7 @@
         "screenshot": "<img src=\"\" />",
         "search-query": "fullQuery",
         "sentence": "cloze-prefixぶちcloze-suffix",
-        "tags": "tag1, tag2",
+        "tags": "vt",
         "url": "<a href=\"url:\">url:</a>"
       }
     ]
@@ -1042,10 +1042,10 @@
         "frequencies": "",
         "furigana": "<ruby>画像<rt>がぞう</rt></ruby>",
         "furigana-plain": "画像[がぞう]",
-        "glossary": "<div style=\"text-align: left;\"><i>(tag1, tag2, Test Dictionary 2)</i> <ul><li>definition21</li><li>[object Object]</li></ul></div>",
-        "glossary-brief": "<div style=\"text-align: left;\"><ul><li>definition21</li><li>[object Object]</li></ul></div>",
-        "glossary-no-dictionary": "<div style=\"text-align: left;\"><i>(tag1, tag2)</i> <ul><li>definition21</li><li>[object Object]</li></ul></div>",
-        "part-of-speech": "Unknown",
+        "glossary": "<div style=\"text-align: left;\"><i>(n, Test Dictionary 2)</i> <ul><li>gazou definition 1</li><li>[object Object]</li></ul></div>",
+        "glossary-brief": "<div style=\"text-align: left;\"><ul><li>gazou definition 1</li><li>[object Object]</li></ul></div>",
+        "glossary-no-dictionary": "<div style=\"text-align: left;\"><i>(n)</i> <ul><li>gazou definition 1</li><li>[object Object]</li></ul></div>",
+        "part-of-speech": "Noun",
         "pitch-accents": "No pitch accent data",
         "pitch-accent-graphs": "No pitch accent data",
         "pitch-accent-positions": "No pitch accent data",
@@ -1053,7 +1053,7 @@
         "screenshot": "<img src=\"\" />",
         "search-query": "fullQuery",
         "sentence": "cloze-prefixがぞうcloze-suffix",
-        "tags": "tag1, tag2",
+        "tags": "n",
         "url": "<a href=\"url:\">url:</a>"
       }
     ]
@@ -1087,9 +1087,9 @@
         "frequencies": "<ul style=\"text-align: left;\"><li>Test Dictionary 2: 3</li><li>Test Dictionary 2: 8</li></ul>",
         "furigana": "<ruby>打<rt>う</rt></ruby>ち<ruby>込<rt>こ</rt></ruby>む",
         "furigana-plain": "打[う]ち 込[こ]む",
-        "glossary": "<div style=\"text-align: left;\"><ol><li><i>(tag1, tag2, Test Dictionary 2)</i> <ul><li>definition13</li><li>definition14</li></ul></li><li><i>(tag1, tag2, Test Dictionary 2)</i> <ul><li>definition15</li><li>definition16</li></ul></li></ol></div>",
-        "glossary-brief": "<div style=\"text-align: left;\"><ol><li><ul><li>definition13</li><li>definition14</li></ul></li><li><ul><li>definition15</li><li>definition16</li></ul></li></ol></div>",
-        "glossary-no-dictionary": "<div style=\"text-align: left;\"><ol><li><i>(tag1, tag2)</i> <ul><li>definition13</li><li>definition14</li></ul></li><li><i>(tag1, tag2)</i> <ul><li>definition15</li><li>definition16</li></ul></li></ol></div>",
+        "glossary": "<div style=\"text-align: left;\"><ol><li><i>(vt, Test Dictionary 2)</i> <ul><li>uchikomu definition 1</li><li>uchikomu definition 2</li></ul></li><li><i>(vt, Test Dictionary 2)</i> <ul><li>uchikomu definition 3</li><li>uchikomu definition 4</li></ul></li></ol></div>",
+        "glossary-brief": "<div style=\"text-align: left;\"><ol><li><ul><li>uchikomu definition 1</li><li>uchikomu definition 2</li></ul></li><li><ul><li>uchikomu definition 3</li><li>uchikomu definition 4</li></ul></li></ol></div>",
+        "glossary-no-dictionary": "<div style=\"text-align: left;\"><ol><li><i>(vt)</i> <ul><li>uchikomu definition 1</li><li>uchikomu definition 2</li></ul></li><li><i>(vt)</i> <ul><li>uchikomu definition 3</li><li>uchikomu definition 4</li></ul></li></ol></div>",
         "part-of-speech": "Godan verb",
         "pitch-accents": "<ol><li><span><span style=\"display:inline-block;position:relative;\">う<span style=\"\"></span></span><span style=\"display:inline-block;position:relative;\">ち<span style=\"display:block;user-select:none;pointer-events:none;position:absolute;top:0.1em;left:0;right:0;height:0;border-top:0.1em solid;\"></span></span><span style=\"display:inline-block;position:relative;\">こ<span style=\"display:block;user-select:none;pointer-events:none;position:absolute;top:0.1em;left:0;right:0;height:0;border-top:0.1em solid;\"></span></span><span style=\"display:inline-block;position:relative;\">む<span style=\"display:block;user-select:none;pointer-events:none;position:absolute;top:0.1em;left:0;right:0;height:0;border-top:0.1em solid;\"></span></span></span></li><li><span><span style=\"display:inline-block;position:relative;\">う<span style=\"\"></span></span><span style=\"display:inline-block;position:relative;\">ち<span style=\"display:block;user-select:none;pointer-events:none;position:absolute;top:0.1em;left:0;right:0;height:0;border-top:0.1em solid;\"></span></span><span style=\"display:inline-block;position:relative;padding-right:0.1em;margin-right:0.1em;\">こ<span style=\"display:block;user-select:none;pointer-events:none;position:absolute;top:0.1em;left:0;right:0;height:0;border-top:0.1em solid;right:-0.1em;height:0.4em;border-right:0.1em solid;\"></span></span><span style=\"display:inline-block;position:relative;\">む<span style=\"\"></span></span></span></li></ol>",
         "pitch-accent-graphs": "<ol><li><svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 250 100\" style=\"display:inline-block;height:2em;\">\n    <defs>\n        <g id=\"term-pitch-accent-graph-dot\"><circle cx=\"0\" cy=\"0\" r=\"15\" style=\"fill:#000;stroke:#000;stroke-width:5;\" /></g>\n        <g id=\"term-pitch-accent-graph-dot-downstep\"><circle cx=\"0\" cy=\"0\" r=\"15\" style=\"fill:none;stroke:#000;stroke-width:5;\" /><circle cx=\"0\" cy=\"0\" r=\"5\" style=\"fill:none;stroke:#000;stroke-width:5;\" /></g>\n        <g id=\"term-pitch-accent-graph-triangle\"><path d=\"M0 13 L15 -13 L-15 -13 Z\" style=\"fill:none;stroke:#000;stroke-width:5;\" /></g>\n    </defs>\n    <path style=\"fill:none;stroke:#000;stroke-width:5;\" d=\"M25 75L75 25L125 25L175 25\"></path>\n    <path style=\"fill:none;stroke:#000;stroke-width:5;stroke-dasharray:5 5;\" d=\"M175 25 L225 25\"></path>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"25\" y=\"75\"></use>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"75\" y=\"25\"></use>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"125\" y=\"25\"></use>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"175\" y=\"25\"></use>\n    <use href=\"#term-pitch-accent-graph-triangle\" x=\"225\" y=\"25\"></use>\n</svg></li><li><svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 250 100\" style=\"display:inline-block;height:2em;\">\n    <defs>\n        <g id=\"term-pitch-accent-graph-dot\"><circle cx=\"0\" cy=\"0\" r=\"15\" style=\"fill:#000;stroke:#000;stroke-width:5;\" /></g>\n        <g id=\"term-pitch-accent-graph-dot-downstep\"><circle cx=\"0\" cy=\"0\" r=\"15\" style=\"fill:none;stroke:#000;stroke-width:5;\" /><circle cx=\"0\" cy=\"0\" r=\"5\" style=\"fill:none;stroke:#000;stroke-width:5;\" /></g>\n        <g id=\"term-pitch-accent-graph-triangle\"><path d=\"M0 13 L15 -13 L-15 -13 Z\" style=\"fill:none;stroke:#000;stroke-width:5;\" /></g>\n    </defs>\n    <path style=\"fill:none;stroke:#000;stroke-width:5;\" d=\"M25 75L75 25L125 25L175 75\"></path>\n    <path style=\"fill:none;stroke:#000;stroke-width:5;stroke-dasharray:5 5;\" d=\"M175 75 L225 75\"></path>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"25\" y=\"75\"></use>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"75\" y=\"25\"></use>\n    <use href=\"#term-pitch-accent-graph-dot-downstep\" x=\"125\" y=\"25\"></use>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"175\" y=\"75\"></use>\n    <use href=\"#term-pitch-accent-graph-triangle\" x=\"225\" y=\"75\"></use>\n</svg></li></ol>",
@@ -1098,7 +1098,7 @@
         "screenshot": "<img src=\"\" />",
         "search-query": "fullQuery",
         "sentence": "cloze-prefix打ち込むcloze-suffix",
-        "tags": "tag1, tag2",
+        "tags": "vt",
         "url": "<a href=\"url:\">url:</a>"
       },
       {
@@ -1115,9 +1115,9 @@
         "frequencies": "<ul style=\"text-align: left;\"><li>Test Dictionary 2: 3</li><li>Test Dictionary 2: 9</li></ul>",
         "furigana": "<ruby>打<rt>ぶ</rt></ruby>ち<ruby>込<rt>こ</rt></ruby>む",
         "furigana-plain": "打[ぶ]ち 込[こ]む",
-        "glossary": "<div style=\"text-align: left;\"><ol><li><i>(tag1, tag2, Test Dictionary 2)</i> <ul><li>definition17</li><li>definition18</li></ul></li><li><i>(tag1, tag2, Test Dictionary 2)</i> <ul><li>definition19</li><li>definition20</li></ul></li></ol></div>",
-        "glossary-brief": "<div style=\"text-align: left;\"><ol><li><ul><li>definition17</li><li>definition18</li></ul></li><li><ul><li>definition19</li><li>definition20</li></ul></li></ol></div>",
-        "glossary-no-dictionary": "<div style=\"text-align: left;\"><ol><li><i>(tag1, tag2)</i> <ul><li>definition17</li><li>definition18</li></ul></li><li><i>(tag1, tag2)</i> <ul><li>definition19</li><li>definition20</li></ul></li></ol></div>",
+        "glossary": "<div style=\"text-align: left;\"><ol><li><i>(vt, Test Dictionary 2)</i> <ul><li>buchikomu definition 1</li><li>buchikomu definition 2</li></ul></li><li><i>(vt, Test Dictionary 2)</i> <ul><li>buchikomu definition 3</li><li>buchikomu definition 4</li></ul></li></ol></div>",
+        "glossary-brief": "<div style=\"text-align: left;\"><ol><li><ul><li>buchikomu definition 1</li><li>buchikomu definition 2</li></ul></li><li><ul><li>buchikomu definition 3</li><li>buchikomu definition 4</li></ul></li></ol></div>",
+        "glossary-no-dictionary": "<div style=\"text-align: left;\"><ol><li><i>(vt)</i> <ul><li>buchikomu definition 1</li><li>buchikomu definition 2</li></ul></li><li><i>(vt)</i> <ul><li>buchikomu definition 3</li><li>buchikomu definition 4</li></ul></li></ol></div>",
         "part-of-speech": "Godan verb",
         "pitch-accents": "<ol><li><span><span style=\"display:inline-block;position:relative;\">ぶ<span style=\"\"></span></span><span style=\"display:inline-block;position:relative;\">ち<span style=\"display:block;user-select:none;pointer-events:none;position:absolute;top:0.1em;left:0;right:0;height:0;border-top:0.1em solid;\"></span></span><span style=\"display:inline-block;position:relative;\">こ<span style=\"display:block;user-select:none;pointer-events:none;position:absolute;top:0.1em;left:0;right:0;height:0;border-top:0.1em solid;\"></span></span><span style=\"display:inline-block;position:relative;\">む<span style=\"display:block;user-select:none;pointer-events:none;position:absolute;top:0.1em;left:0;right:0;height:0;border-top:0.1em solid;\"></span></span></span></li><li><span><span style=\"display:inline-block;position:relative;\">ぶ<span style=\"\"></span></span><span style=\"display:inline-block;position:relative;\">ち<span style=\"display:block;user-select:none;pointer-events:none;position:absolute;top:0.1em;left:0;right:0;height:0;border-top:0.1em solid;\"></span></span><span style=\"display:inline-block;position:relative;padding-right:0.1em;margin-right:0.1em;\">こ<span style=\"display:block;user-select:none;pointer-events:none;position:absolute;top:0.1em;left:0;right:0;height:0;border-top:0.1em solid;right:-0.1em;height:0.4em;border-right:0.1em solid;\"></span></span><span style=\"display:inline-block;position:relative;\">む<span style=\"\"></span></span></span></li></ol>",
         "pitch-accent-graphs": "<ol><li><svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 250 100\" style=\"display:inline-block;height:2em;\">\n    <defs>\n        <g id=\"term-pitch-accent-graph-dot\"><circle cx=\"0\" cy=\"0\" r=\"15\" style=\"fill:#000;stroke:#000;stroke-width:5;\" /></g>\n        <g id=\"term-pitch-accent-graph-dot-downstep\"><circle cx=\"0\" cy=\"0\" r=\"15\" style=\"fill:none;stroke:#000;stroke-width:5;\" /><circle cx=\"0\" cy=\"0\" r=\"5\" style=\"fill:none;stroke:#000;stroke-width:5;\" /></g>\n        <g id=\"term-pitch-accent-graph-triangle\"><path d=\"M0 13 L15 -13 L-15 -13 Z\" style=\"fill:none;stroke:#000;stroke-width:5;\" /></g>\n    </defs>\n    <path style=\"fill:none;stroke:#000;stroke-width:5;\" d=\"M25 75L75 25L125 25L175 25\"></path>\n    <path style=\"fill:none;stroke:#000;stroke-width:5;stroke-dasharray:5 5;\" d=\"M175 25 L225 25\"></path>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"25\" y=\"75\"></use>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"75\" y=\"25\"></use>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"125\" y=\"25\"></use>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"175\" y=\"25\"></use>\n    <use href=\"#term-pitch-accent-graph-triangle\" x=\"225\" y=\"25\"></use>\n</svg></li><li><svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 250 100\" style=\"display:inline-block;height:2em;\">\n    <defs>\n        <g id=\"term-pitch-accent-graph-dot\"><circle cx=\"0\" cy=\"0\" r=\"15\" style=\"fill:#000;stroke:#000;stroke-width:5;\" /></g>\n        <g id=\"term-pitch-accent-graph-dot-downstep\"><circle cx=\"0\" cy=\"0\" r=\"15\" style=\"fill:none;stroke:#000;stroke-width:5;\" /><circle cx=\"0\" cy=\"0\" r=\"5\" style=\"fill:none;stroke:#000;stroke-width:5;\" /></g>\n        <g id=\"term-pitch-accent-graph-triangle\"><path d=\"M0 13 L15 -13 L-15 -13 Z\" style=\"fill:none;stroke:#000;stroke-width:5;\" /></g>\n    </defs>\n    <path style=\"fill:none;stroke:#000;stroke-width:5;\" d=\"M25 75L75 25L125 25L175 75\"></path>\n    <path style=\"fill:none;stroke:#000;stroke-width:5;stroke-dasharray:5 5;\" d=\"M175 75 L225 75\"></path>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"25\" y=\"75\"></use>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"75\" y=\"25\"></use>\n    <use href=\"#term-pitch-accent-graph-dot-downstep\" x=\"125\" y=\"25\"></use>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"175\" y=\"75\"></use>\n    <use href=\"#term-pitch-accent-graph-triangle\" x=\"225\" y=\"75\"></use>\n</svg></li></ol>",
@@ -1126,7 +1126,7 @@
         "screenshot": "<img src=\"\" />",
         "search-query": "fullQuery",
         "sentence": "cloze-prefix打ち込むcloze-suffix",
-        "tags": "tag1, tag2",
+        "tags": "vt",
         "url": "<a href=\"url:\">url:</a>"
       },
       {
@@ -1143,9 +1143,9 @@
         "frequencies": "<ul style=\"text-align: left;\"><li>Test Dictionary 2: 2</li><li>Test Dictionary 2: 6</li></ul>",
         "furigana": "<ruby>打<rt>う</rt></ruby>つ",
         "furigana-plain": "打[う]つ",
-        "glossary": "<div style=\"text-align: left;\"><ol><li><i>(tag1, tag2, Test Dictionary 2)</i> <ul><li>definition5</li><li>definition6</li></ul></li><li><i>(tag1, tag2, Test Dictionary 2)</i> <ul><li>definition7</li><li>definition8</li></ul></li></ol></div>",
-        "glossary-brief": "<div style=\"text-align: left;\"><ol><li><ul><li>definition5</li><li>definition6</li></ul></li><li><ul><li>definition7</li><li>definition8</li></ul></li></ol></div>",
-        "glossary-no-dictionary": "<div style=\"text-align: left;\"><ol><li><i>(tag1, tag2)</i> <ul><li>definition5</li><li>definition6</li></ul></li><li><i>(tag1, tag2)</i> <ul><li>definition7</li><li>definition8</li></ul></li></ol></div>",
+        "glossary": "<div style=\"text-align: left;\"><ol><li><i>(vt, Test Dictionary 2)</i> <ul><li>utsu definition 1</li><li>utsu definition 2</li></ul></li><li><i>(vt, Test Dictionary 2)</i> <ul><li>utsu definition 3</li><li>utsu definition 4</li></ul></li></ol></div>",
+        "glossary-brief": "<div style=\"text-align: left;\"><ol><li><ul><li>utsu definition 1</li><li>utsu definition 2</li></ul></li><li><ul><li>utsu definition 3</li><li>utsu definition 4</li></ul></li></ol></div>",
+        "glossary-no-dictionary": "<div style=\"text-align: left;\"><ol><li><i>(vt)</i> <ul><li>utsu definition 1</li><li>utsu definition 2</li></ul></li><li><i>(vt)</i> <ul><li>utsu definition 3</li><li>utsu definition 4</li></ul></li></ol></div>",
         "part-of-speech": "Godan verb",
         "pitch-accents": "No pitch accent data",
         "pitch-accent-graphs": "No pitch accent data",
@@ -1154,7 +1154,7 @@
         "screenshot": "<img src=\"\" />",
         "search-query": "fullQuery",
         "sentence": "cloze-prefix打ちcloze-suffix",
-        "tags": "tag1, tag2",
+        "tags": "vt",
         "url": "<a href=\"url:\">url:</a>"
       },
       {
@@ -1171,9 +1171,9 @@
         "frequencies": "<ul style=\"text-align: left;\"><li>Test Dictionary 2: 2</li><li>Test Dictionary 2: 7</li></ul>",
         "furigana": "<ruby>打<rt>ぶ</rt></ruby>つ",
         "furigana-plain": "打[ぶ]つ",
-        "glossary": "<div style=\"text-align: left;\"><ol><li><i>(tag1, tag2, Test Dictionary 2)</i> <ul><li>definition9</li><li>definition10</li></ul></li><li><i>(tag1, tag2, Test Dictionary 2)</i> <ul><li>definition11</li><li>definition12</li></ul></li></ol></div>",
-        "glossary-brief": "<div style=\"text-align: left;\"><ol><li><ul><li>definition9</li><li>definition10</li></ul></li><li><ul><li>definition11</li><li>definition12</li></ul></li></ol></div>",
-        "glossary-no-dictionary": "<div style=\"text-align: left;\"><ol><li><i>(tag1, tag2)</i> <ul><li>definition9</li><li>definition10</li></ul></li><li><i>(tag1, tag2)</i> <ul><li>definition11</li><li>definition12</li></ul></li></ol></div>",
+        "glossary": "<div style=\"text-align: left;\"><ol><li><i>(vt, Test Dictionary 2)</i> <ul><li>butsu definition 1</li><li>butsu definition 2</li></ul></li><li><i>(vt, Test Dictionary 2)</i> <ul><li>butsu definition 3</li><li>butsu definition 4</li></ul></li></ol></div>",
+        "glossary-brief": "<div style=\"text-align: left;\"><ol><li><ul><li>butsu definition 1</li><li>butsu definition 2</li></ul></li><li><ul><li>butsu definition 3</li><li>butsu definition 4</li></ul></li></ol></div>",
+        "glossary-no-dictionary": "<div style=\"text-align: left;\"><ol><li><i>(vt)</i> <ul><li>butsu definition 1</li><li>butsu definition 2</li></ul></li><li><i>(vt)</i> <ul><li>butsu definition 3</li><li>butsu definition 4</li></ul></li></ol></div>",
         "part-of-speech": "Godan verb",
         "pitch-accents": "No pitch accent data",
         "pitch-accent-graphs": "No pitch accent data",
@@ -1182,7 +1182,7 @@
         "screenshot": "<img src=\"\" />",
         "search-query": "fullQuery",
         "sentence": "cloze-prefix打ちcloze-suffix",
-        "tags": "tag1, tag2",
+        "tags": "vt",
         "url": "<a href=\"url:\">url:</a>"
       },
       {
@@ -1199,10 +1199,10 @@
         "frequencies": "<ul style=\"text-align: left;\"><li>Test Dictionary 2: 1</li><li>Test Dictionary 2: 4</li></ul>",
         "furigana": "<ruby>打<rt>だ</rt></ruby>",
         "furigana-plain": "打[だ]",
-        "glossary": "<div style=\"text-align: left;\"><i>(tag1, tag2, Test Dictionary 2)</i> <ul><li>definition1</li><li>definition2</li></ul></div>",
-        "glossary-brief": "<div style=\"text-align: left;\"><ul><li>definition1</li><li>definition2</li></ul></div>",
-        "glossary-no-dictionary": "<div style=\"text-align: left;\"><i>(tag1, tag2)</i> <ul><li>definition1</li><li>definition2</li></ul></div>",
-        "part-of-speech": "Unknown",
+        "glossary": "<div style=\"text-align: left;\"><i>(n, Test Dictionary 2)</i> <ul><li>da definition 1</li><li>da definition 2</li></ul></div>",
+        "glossary-brief": "<div style=\"text-align: left;\"><ul><li>da definition 1</li><li>da definition 2</li></ul></div>",
+        "glossary-no-dictionary": "<div style=\"text-align: left;\"><i>(n)</i> <ul><li>da definition 1</li><li>da definition 2</li></ul></div>",
+        "part-of-speech": "Noun",
         "pitch-accents": "No pitch accent data",
         "pitch-accent-graphs": "No pitch accent data",
         "pitch-accent-positions": "No pitch accent data",
@@ -1210,7 +1210,7 @@
         "screenshot": "<img src=\"\" />",
         "search-query": "fullQuery",
         "sentence": "cloze-prefix打cloze-suffix",
-        "tags": "tag1, tag2",
+        "tags": "n",
         "url": "<a href=\"url:\">url:</a>"
       },
       {
@@ -1227,10 +1227,10 @@
         "frequencies": "<ul style=\"text-align: left;\"><li>Test Dictionary 2: 1</li><li>Test Dictionary 2: 5</li></ul>",
         "furigana": "<ruby>打<rt>ダース</rt></ruby>",
         "furigana-plain": "打[ダース]",
-        "glossary": "<div style=\"text-align: left;\"><i>(tag1, tag2, Test Dictionary 2)</i> <ul><li>definition3</li><li>definition4</li></ul></div>",
-        "glossary-brief": "<div style=\"text-align: left;\"><ul><li>definition3</li><li>definition4</li></ul></div>",
-        "glossary-no-dictionary": "<div style=\"text-align: left;\"><i>(tag1, tag2)</i> <ul><li>definition3</li><li>definition4</li></ul></div>",
-        "part-of-speech": "Unknown",
+        "glossary": "<div style=\"text-align: left;\"><i>(abbr, n, Test Dictionary 2)</i> <ul><li>daasu definition 1</li><li>daasu definition 2</li></ul></div>",
+        "glossary-brief": "<div style=\"text-align: left;\"><ul><li>daasu definition 1</li><li>daasu definition 2</li></ul></div>",
+        "glossary-no-dictionary": "<div style=\"text-align: left;\"><i>(abbr, n)</i> <ul><li>daasu definition 1</li><li>daasu definition 2</li></ul></div>",
+        "part-of-speech": "Noun",
         "pitch-accents": "No pitch accent data",
         "pitch-accent-graphs": "No pitch accent data",
         "pitch-accent-positions": "No pitch accent data",
@@ -1238,7 +1238,7 @@
         "screenshot": "<img src=\"\" />",
         "search-query": "fullQuery",
         "sentence": "cloze-prefix打cloze-suffix",
-        "tags": "tag1, tag2",
+        "tags": "abbr, n",
         "url": "<a href=\"url:\">url:</a>"
       }
     ]
@@ -1260,9 +1260,9 @@
         "frequencies": "<ul style=\"text-align: left;\"><li>(<ruby>打<rt>う</rt></ruby>ち<ruby>込<rt>こ</rt></ruby>む) Test Dictionary 2: 3</li><li>(<ruby>打<rt>う</rt></ruby>ち<ruby>込<rt>こ</rt></ruby>む) Test Dictionary 2: 8</li><li>(<ruby>打<rt>ぶ</rt></ruby>ち<ruby>込<rt>こ</rt></ruby>む) Test Dictionary 2: 3</li><li>(<ruby>打<rt>ぶ</rt></ruby>ち<ruby>込<rt>こ</rt></ruby>む) Test Dictionary 2: 9</li></ul>",
         "furigana": "<span class=\"expression-normal\"><ruby>打<rt>う</rt></ruby>ち<ruby>込<rt>こ</rt></ruby>む</span>、<span class=\"expression-normal\"><ruby>打<rt>ぶ</rt></ruby>ち<ruby>込<rt>こ</rt></ruby>む</span>",
         "furigana-plain": "<span class=\"expression-normal\">打[う]ち 込[こ]む</span>、<span class=\"expression-normal\">打[ぶ]ち 込[こ]む</span>",
-        "glossary": "<div style=\"text-align: left;\"><ol><li><i>(tag1, tag2, Test Dictionary 2)</i> (うちこむ only) <ul><li>definition13</li><li>definition14</li></ul></li><li><i>(tag1, tag2, Test Dictionary 2)</i> (ぶちこむ only) <ul><li>definition17</li><li>definition18</li></ul></li><li><i>(tag1, tag2, Test Dictionary 2)</i> (うちこむ only) <ul><li>definition15</li><li>definition16</li></ul></li><li><i>(tag1, tag2, Test Dictionary 2)</i> (ぶちこむ only) <ul><li>definition19</li><li>definition20</li></ul></li></ol></div>",
-        "glossary-brief": "<div style=\"text-align: left;\"><ol><li><ul><li>definition13</li><li>definition14</li></ul></li><li><ul><li>definition17</li><li>definition18</li></ul></li><li><ul><li>definition15</li><li>definition16</li></ul></li><li><ul><li>definition19</li><li>definition20</li></ul></li></ol></div>",
-        "glossary-no-dictionary": "<div style=\"text-align: left;\"><ol><li><i>(tag1, tag2)</i> (うちこむ only) <ul><li>definition13</li><li>definition14</li></ul></li><li><i>(tag1, tag2)</i> (ぶちこむ only) <ul><li>definition17</li><li>definition18</li></ul></li><li><i>(tag1, tag2)</i> (うちこむ only) <ul><li>definition15</li><li>definition16</li></ul></li><li><i>(tag1, tag2)</i> (ぶちこむ only) <ul><li>definition19</li><li>definition20</li></ul></li></ol></div>",
+        "glossary": "<div style=\"text-align: left;\"><ol><li><i>(vt, Test Dictionary 2)</i> (うちこむ only) <ul><li>uchikomu definition 1</li><li>uchikomu definition 2</li></ul></li><li><i>(vt, Test Dictionary 2)</i> (ぶちこむ only) <ul><li>buchikomu definition 1</li><li>buchikomu definition 2</li></ul></li><li><i>(vt, Test Dictionary 2)</i> (うちこむ only) <ul><li>uchikomu definition 3</li><li>uchikomu definition 4</li></ul></li><li><i>(vt, Test Dictionary 2)</i> (ぶちこむ only) <ul><li>buchikomu definition 3</li><li>buchikomu definition 4</li></ul></li></ol></div>",
+        "glossary-brief": "<div style=\"text-align: left;\"><ol><li><ul><li>uchikomu definition 1</li><li>uchikomu definition 2</li></ul></li><li><ul><li>buchikomu definition 1</li><li>buchikomu definition 2</li></ul></li><li><ul><li>uchikomu definition 3</li><li>uchikomu definition 4</li></ul></li><li><ul><li>buchikomu definition 3</li><li>buchikomu definition 4</li></ul></li></ol></div>",
+        "glossary-no-dictionary": "<div style=\"text-align: left;\"><ol><li><i>(vt)</i> (うちこむ only) <ul><li>uchikomu definition 1</li><li>uchikomu definition 2</li></ul></li><li><i>(vt)</i> (ぶちこむ only) <ul><li>buchikomu definition 1</li><li>buchikomu definition 2</li></ul></li><li><i>(vt)</i> (うちこむ only) <ul><li>uchikomu definition 3</li><li>uchikomu definition 4</li></ul></li><li><i>(vt)</i> (ぶちこむ only) <ul><li>buchikomu definition 3</li><li>buchikomu definition 4</li></ul></li></ol></div>",
         "part-of-speech": "Godan verb",
         "pitch-accents": "<ol><li><em>(うちこむ only) </em><span><span style=\"display:inline-block;position:relative;\">う<span style=\"\"></span></span><span style=\"display:inline-block;position:relative;\">ち<span style=\"display:block;user-select:none;pointer-events:none;position:absolute;top:0.1em;left:0;right:0;height:0;border-top:0.1em solid;\"></span></span><span style=\"display:inline-block;position:relative;\">こ<span style=\"display:block;user-select:none;pointer-events:none;position:absolute;top:0.1em;left:0;right:0;height:0;border-top:0.1em solid;\"></span></span><span style=\"display:inline-block;position:relative;\">む<span style=\"display:block;user-select:none;pointer-events:none;position:absolute;top:0.1em;left:0;right:0;height:0;border-top:0.1em solid;\"></span></span></span></li><li><em>(うちこむ only) </em><span><span style=\"display:inline-block;position:relative;\">う<span style=\"\"></span></span><span style=\"display:inline-block;position:relative;\">ち<span style=\"display:block;user-select:none;pointer-events:none;position:absolute;top:0.1em;left:0;right:0;height:0;border-top:0.1em solid;\"></span></span><span style=\"display:inline-block;position:relative;padding-right:0.1em;margin-right:0.1em;\">こ<span style=\"display:block;user-select:none;pointer-events:none;position:absolute;top:0.1em;left:0;right:0;height:0;border-top:0.1em solid;right:-0.1em;height:0.4em;border-right:0.1em solid;\"></span></span><span style=\"display:inline-block;position:relative;\">む<span style=\"\"></span></span></span></li><li><em>(ぶちこむ only) </em><span><span style=\"display:inline-block;position:relative;\">ぶ<span style=\"\"></span></span><span style=\"display:inline-block;position:relative;\">ち<span style=\"display:block;user-select:none;pointer-events:none;position:absolute;top:0.1em;left:0;right:0;height:0;border-top:0.1em solid;\"></span></span><span style=\"display:inline-block;position:relative;\">こ<span style=\"display:block;user-select:none;pointer-events:none;position:absolute;top:0.1em;left:0;right:0;height:0;border-top:0.1em solid;\"></span></span><span style=\"display:inline-block;position:relative;\">む<span style=\"display:block;user-select:none;pointer-events:none;position:absolute;top:0.1em;left:0;right:0;height:0;border-top:0.1em solid;\"></span></span></span></li><li><em>(ぶちこむ only) </em><span><span style=\"display:inline-block;position:relative;\">ぶ<span style=\"\"></span></span><span style=\"display:inline-block;position:relative;\">ち<span style=\"display:block;user-select:none;pointer-events:none;position:absolute;top:0.1em;left:0;right:0;height:0;border-top:0.1em solid;\"></span></span><span style=\"display:inline-block;position:relative;padding-right:0.1em;margin-right:0.1em;\">こ<span style=\"display:block;user-select:none;pointer-events:none;position:absolute;top:0.1em;left:0;right:0;height:0;border-top:0.1em solid;right:-0.1em;height:0.4em;border-right:0.1em solid;\"></span></span><span style=\"display:inline-block;position:relative;\">む<span style=\"\"></span></span></span></li></ol>",
         "pitch-accent-graphs": "<ol><li><em>(うちこむ only) </em><svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 250 100\" style=\"display:inline-block;height:2em;\">\n    <defs>\n        <g id=\"term-pitch-accent-graph-dot\"><circle cx=\"0\" cy=\"0\" r=\"15\" style=\"fill:#000;stroke:#000;stroke-width:5;\" /></g>\n        <g id=\"term-pitch-accent-graph-dot-downstep\"><circle cx=\"0\" cy=\"0\" r=\"15\" style=\"fill:none;stroke:#000;stroke-width:5;\" /><circle cx=\"0\" cy=\"0\" r=\"5\" style=\"fill:none;stroke:#000;stroke-width:5;\" /></g>\n        <g id=\"term-pitch-accent-graph-triangle\"><path d=\"M0 13 L15 -13 L-15 -13 Z\" style=\"fill:none;stroke:#000;stroke-width:5;\" /></g>\n    </defs>\n    <path style=\"fill:none;stroke:#000;stroke-width:5;\" d=\"M25 75L75 25L125 25L175 25\"></path>\n    <path style=\"fill:none;stroke:#000;stroke-width:5;stroke-dasharray:5 5;\" d=\"M175 25 L225 25\"></path>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"25\" y=\"75\"></use>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"75\" y=\"25\"></use>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"125\" y=\"25\"></use>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"175\" y=\"25\"></use>\n    <use href=\"#term-pitch-accent-graph-triangle\" x=\"225\" y=\"25\"></use>\n</svg></li><li><em>(うちこむ only) </em><svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 250 100\" style=\"display:inline-block;height:2em;\">\n    <defs>\n        <g id=\"term-pitch-accent-graph-dot\"><circle cx=\"0\" cy=\"0\" r=\"15\" style=\"fill:#000;stroke:#000;stroke-width:5;\" /></g>\n        <g id=\"term-pitch-accent-graph-dot-downstep\"><circle cx=\"0\" cy=\"0\" r=\"15\" style=\"fill:none;stroke:#000;stroke-width:5;\" /><circle cx=\"0\" cy=\"0\" r=\"5\" style=\"fill:none;stroke:#000;stroke-width:5;\" /></g>\n        <g id=\"term-pitch-accent-graph-triangle\"><path d=\"M0 13 L15 -13 L-15 -13 Z\" style=\"fill:none;stroke:#000;stroke-width:5;\" /></g>\n    </defs>\n    <path style=\"fill:none;stroke:#000;stroke-width:5;\" d=\"M25 75L75 25L125 25L175 75\"></path>\n    <path style=\"fill:none;stroke:#000;stroke-width:5;stroke-dasharray:5 5;\" d=\"M175 75 L225 75\"></path>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"25\" y=\"75\"></use>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"75\" y=\"25\"></use>\n    <use href=\"#term-pitch-accent-graph-dot-downstep\" x=\"125\" y=\"25\"></use>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"175\" y=\"75\"></use>\n    <use href=\"#term-pitch-accent-graph-triangle\" x=\"225\" y=\"75\"></use>\n</svg></li><li><em>(ぶちこむ only) </em><svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 250 100\" style=\"display:inline-block;height:2em;\">\n    <defs>\n        <g id=\"term-pitch-accent-graph-dot\"><circle cx=\"0\" cy=\"0\" r=\"15\" style=\"fill:#000;stroke:#000;stroke-width:5;\" /></g>\n        <g id=\"term-pitch-accent-graph-dot-downstep\"><circle cx=\"0\" cy=\"0\" r=\"15\" style=\"fill:none;stroke:#000;stroke-width:5;\" /><circle cx=\"0\" cy=\"0\" r=\"5\" style=\"fill:none;stroke:#000;stroke-width:5;\" /></g>\n        <g id=\"term-pitch-accent-graph-triangle\"><path d=\"M0 13 L15 -13 L-15 -13 Z\" style=\"fill:none;stroke:#000;stroke-width:5;\" /></g>\n    </defs>\n    <path style=\"fill:none;stroke:#000;stroke-width:5;\" d=\"M25 75L75 25L125 25L175 25\"></path>\n    <path style=\"fill:none;stroke:#000;stroke-width:5;stroke-dasharray:5 5;\" d=\"M175 25 L225 25\"></path>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"25\" y=\"75\"></use>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"75\" y=\"25\"></use>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"125\" y=\"25\"></use>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"175\" y=\"25\"></use>\n    <use href=\"#term-pitch-accent-graph-triangle\" x=\"225\" y=\"25\"></use>\n</svg></li><li><em>(ぶちこむ only) </em><svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 250 100\" style=\"display:inline-block;height:2em;\">\n    <defs>\n        <g id=\"term-pitch-accent-graph-dot\"><circle cx=\"0\" cy=\"0\" r=\"15\" style=\"fill:#000;stroke:#000;stroke-width:5;\" /></g>\n        <g id=\"term-pitch-accent-graph-dot-downstep\"><circle cx=\"0\" cy=\"0\" r=\"15\" style=\"fill:none;stroke:#000;stroke-width:5;\" /><circle cx=\"0\" cy=\"0\" r=\"5\" style=\"fill:none;stroke:#000;stroke-width:5;\" /></g>\n        <g id=\"term-pitch-accent-graph-triangle\"><path d=\"M0 13 L15 -13 L-15 -13 Z\" style=\"fill:none;stroke:#000;stroke-width:5;\" /></g>\n    </defs>\n    <path style=\"fill:none;stroke:#000;stroke-width:5;\" d=\"M25 75L75 25L125 25L175 75\"></path>\n    <path style=\"fill:none;stroke:#000;stroke-width:5;stroke-dasharray:5 5;\" d=\"M175 75 L225 75\"></path>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"25\" y=\"75\"></use>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"75\" y=\"25\"></use>\n    <use href=\"#term-pitch-accent-graph-dot-downstep\" x=\"125\" y=\"25\"></use>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"175\" y=\"75\"></use>\n    <use href=\"#term-pitch-accent-graph-triangle\" x=\"225\" y=\"75\"></use>\n</svg></li></ol>",
@@ -1271,7 +1271,7 @@
         "screenshot": "<img src=\"\" />",
         "search-query": "fullQuery",
         "sentence": "cloze-prefix打ち込むcloze-suffix",
-        "tags": "tag1, tag2",
+        "tags": "vt",
         "url": "<a href=\"url:\">url:</a>"
       },
       {
@@ -1288,9 +1288,9 @@
         "frequencies": "<ul style=\"text-align: left;\"><li>(<ruby>打<rt>う</rt></ruby>つ) Test Dictionary 2: 2</li><li>(<ruby>打<rt>う</rt></ruby>つ) Test Dictionary 2: 6</li><li>(<ruby>打<rt>ぶ</rt></ruby>つ) Test Dictionary 2: 2</li><li>(<ruby>打<rt>ぶ</rt></ruby>つ) Test Dictionary 2: 7</li></ul>",
         "furigana": "<span class=\"expression-normal\"><ruby>打<rt>う</rt></ruby>つ</span>、<span class=\"expression-normal\"><ruby>打<rt>ぶ</rt></ruby>つ</span>",
         "furigana-plain": "<span class=\"expression-normal\">打[う]つ</span>、<span class=\"expression-normal\">打[ぶ]つ</span>",
-        "glossary": "<div style=\"text-align: left;\"><ol><li><i>(tag1, tag2, Test Dictionary 2)</i> (うつ only) <ul><li>definition5</li><li>definition6</li></ul></li><li><i>(tag1, tag2, Test Dictionary 2)</i> (ぶつ only) <ul><li>definition9</li><li>definition10</li></ul></li><li><i>(tag1, tag2, Test Dictionary 2)</i> (うつ only) <ul><li>definition7</li><li>definition8</li></ul></li><li><i>(tag1, tag2, Test Dictionary 2)</i> (ぶつ only) <ul><li>definition11</li><li>definition12</li></ul></li></ol></div>",
-        "glossary-brief": "<div style=\"text-align: left;\"><ol><li><ul><li>definition5</li><li>definition6</li></ul></li><li><ul><li>definition9</li><li>definition10</li></ul></li><li><ul><li>definition7</li><li>definition8</li></ul></li><li><ul><li>definition11</li><li>definition12</li></ul></li></ol></div>",
-        "glossary-no-dictionary": "<div style=\"text-align: left;\"><ol><li><i>(tag1, tag2)</i> (うつ only) <ul><li>definition5</li><li>definition6</li></ul></li><li><i>(tag1, tag2)</i> (ぶつ only) <ul><li>definition9</li><li>definition10</li></ul></li><li><i>(tag1, tag2)</i> (うつ only) <ul><li>definition7</li><li>definition8</li></ul></li><li><i>(tag1, tag2)</i> (ぶつ only) <ul><li>definition11</li><li>definition12</li></ul></li></ol></div>",
+        "glossary": "<div style=\"text-align: left;\"><ol><li><i>(vt, Test Dictionary 2)</i> (うつ only) <ul><li>utsu definition 1</li><li>utsu definition 2</li></ul></li><li><i>(vt, Test Dictionary 2)</i> (ぶつ only) <ul><li>butsu definition 1</li><li>butsu definition 2</li></ul></li><li><i>(vt, Test Dictionary 2)</i> (うつ only) <ul><li>utsu definition 3</li><li>utsu definition 4</li></ul></li><li><i>(vt, Test Dictionary 2)</i> (ぶつ only) <ul><li>butsu definition 3</li><li>butsu definition 4</li></ul></li></ol></div>",
+        "glossary-brief": "<div style=\"text-align: left;\"><ol><li><ul><li>utsu definition 1</li><li>utsu definition 2</li></ul></li><li><ul><li>butsu definition 1</li><li>butsu definition 2</li></ul></li><li><ul><li>utsu definition 3</li><li>utsu definition 4</li></ul></li><li><ul><li>butsu definition 3</li><li>butsu definition 4</li></ul></li></ol></div>",
+        "glossary-no-dictionary": "<div style=\"text-align: left;\"><ol><li><i>(vt)</i> (うつ only) <ul><li>utsu definition 1</li><li>utsu definition 2</li></ul></li><li><i>(vt)</i> (ぶつ only) <ul><li>butsu definition 1</li><li>butsu definition 2</li></ul></li><li><i>(vt)</i> (うつ only) <ul><li>utsu definition 3</li><li>utsu definition 4</li></ul></li><li><i>(vt)</i> (ぶつ only) <ul><li>butsu definition 3</li><li>butsu definition 4</li></ul></li></ol></div>",
         "part-of-speech": "Godan verb",
         "pitch-accents": "No pitch accent data",
         "pitch-accent-graphs": "No pitch accent data",
@@ -1299,7 +1299,7 @@
         "screenshot": "<img src=\"\" />",
         "search-query": "fullQuery",
         "sentence": "cloze-prefix打ちcloze-suffix",
-        "tags": "tag1, tag2",
+        "tags": "vt",
         "url": "<a href=\"url:\">url:</a>"
       },
       {
@@ -1316,10 +1316,10 @@
         "frequencies": "<ul style=\"text-align: left;\"><li>Test Dictionary 2: 1</li><li>Test Dictionary 2: 4</li></ul>",
         "furigana": "<span class=\"expression-normal\"><ruby>打<rt>だ</rt></ruby></span>",
         "furigana-plain": "<span class=\"expression-normal\">打[だ]</span>",
-        "glossary": "<div style=\"text-align: left;\"><i>(tag1, tag2, Test Dictionary 2)</i> <ul><li>definition1</li><li>definition2</li></ul></div>",
-        "glossary-brief": "<div style=\"text-align: left;\"><ul><li>definition1</li><li>definition2</li></ul></div>",
-        "glossary-no-dictionary": "<div style=\"text-align: left;\"><i>(tag1, tag2)</i> <ul><li>definition1</li><li>definition2</li></ul></div>",
-        "part-of-speech": "Unknown",
+        "glossary": "<div style=\"text-align: left;\"><i>(n, Test Dictionary 2)</i> <ul><li>da definition 1</li><li>da definition 2</li></ul></div>",
+        "glossary-brief": "<div style=\"text-align: left;\"><ul><li>da definition 1</li><li>da definition 2</li></ul></div>",
+        "glossary-no-dictionary": "<div style=\"text-align: left;\"><i>(n)</i> <ul><li>da definition 1</li><li>da definition 2</li></ul></div>",
+        "part-of-speech": "Noun",
         "pitch-accents": "No pitch accent data",
         "pitch-accent-graphs": "No pitch accent data",
         "pitch-accent-positions": "No pitch accent data",
@@ -1327,7 +1327,7 @@
         "screenshot": "<img src=\"\" />",
         "search-query": "fullQuery",
         "sentence": "cloze-prefix打cloze-suffix",
-        "tags": "tag1, tag2",
+        "tags": "n",
         "url": "<a href=\"url:\">url:</a>"
       },
       {
@@ -1344,10 +1344,10 @@
         "frequencies": "<ul style=\"text-align: left;\"><li>Test Dictionary 2: 1</li><li>Test Dictionary 2: 5</li></ul>",
         "furigana": "<span class=\"expression-normal\"><ruby>打<rt>ダース</rt></ruby></span>",
         "furigana-plain": "<span class=\"expression-normal\">打[ダース]</span>",
-        "glossary": "<div style=\"text-align: left;\"><i>(tag1, tag2, Test Dictionary 2)</i> <ul><li>definition3</li><li>definition4</li></ul></div>",
-        "glossary-brief": "<div style=\"text-align: left;\"><ul><li>definition3</li><li>definition4</li></ul></div>",
-        "glossary-no-dictionary": "<div style=\"text-align: left;\"><i>(tag1, tag2)</i> <ul><li>definition3</li><li>definition4</li></ul></div>",
-        "part-of-speech": "Unknown",
+        "glossary": "<div style=\"text-align: left;\"><i>(abbr, n, Test Dictionary 2)</i> <ul><li>daasu definition 1</li><li>daasu definition 2</li></ul></div>",
+        "glossary-brief": "<div style=\"text-align: left;\"><ul><li>daasu definition 1</li><li>daasu definition 2</li></ul></div>",
+        "glossary-no-dictionary": "<div style=\"text-align: left;\"><i>(abbr, n)</i> <ul><li>daasu definition 1</li><li>daasu definition 2</li></ul></div>",
+        "part-of-speech": "Noun",
         "pitch-accents": "No pitch accent data",
         "pitch-accent-graphs": "No pitch accent data",
         "pitch-accent-positions": "No pitch accent data",
@@ -1355,7 +1355,7 @@
         "screenshot": "<img src=\"\" />",
         "search-query": "fullQuery",
         "sentence": "cloze-prefix打cloze-suffix",
-        "tags": "tag1, tag2",
+        "tags": "abbr, n",
         "url": "<a href=\"url:\">url:</a>"
       }
     ]
@@ -1377,9 +1377,9 @@
         "frequencies": "<ul style=\"text-align: left;\"><li>Test Dictionary 2: 3</li><li>Test Dictionary 2: 8</li></ul>",
         "furigana": "<ruby>打<rt>う</rt></ruby>ち<ruby>込<rt>こ</rt></ruby>む",
         "furigana-plain": "打[う]ち 込[こ]む",
-        "glossary": "<div style=\"text-align: left;\"><i>(tag1, tag2, Test Dictionary 2)</i> <ul><li>definition13</li><li>definition14</li></ul></div>",
-        "glossary-brief": "<div style=\"text-align: left;\"><ul><li>definition13</li><li>definition14</li></ul></div>",
-        "glossary-no-dictionary": "<div style=\"text-align: left;\"><i>(tag1, tag2)</i> <ul><li>definition13</li><li>definition14</li></ul></div>",
+        "glossary": "<div style=\"text-align: left;\"><i>(vt, Test Dictionary 2)</i> <ul><li>uchikomu definition 1</li><li>uchikomu definition 2</li></ul></div>",
+        "glossary-brief": "<div style=\"text-align: left;\"><ul><li>uchikomu definition 1</li><li>uchikomu definition 2</li></ul></div>",
+        "glossary-no-dictionary": "<div style=\"text-align: left;\"><i>(vt)</i> <ul><li>uchikomu definition 1</li><li>uchikomu definition 2</li></ul></div>",
         "part-of-speech": "Godan verb",
         "pitch-accents": "<ol><li><span><span style=\"display:inline-block;position:relative;\">う<span style=\"\"></span></span><span style=\"display:inline-block;position:relative;\">ち<span style=\"display:block;user-select:none;pointer-events:none;position:absolute;top:0.1em;left:0;right:0;height:0;border-top:0.1em solid;\"></span></span><span style=\"display:inline-block;position:relative;\">こ<span style=\"display:block;user-select:none;pointer-events:none;position:absolute;top:0.1em;left:0;right:0;height:0;border-top:0.1em solid;\"></span></span><span style=\"display:inline-block;position:relative;\">む<span style=\"display:block;user-select:none;pointer-events:none;position:absolute;top:0.1em;left:0;right:0;height:0;border-top:0.1em solid;\"></span></span></span></li><li><span><span style=\"display:inline-block;position:relative;\">う<span style=\"\"></span></span><span style=\"display:inline-block;position:relative;\">ち<span style=\"display:block;user-select:none;pointer-events:none;position:absolute;top:0.1em;left:0;right:0;height:0;border-top:0.1em solid;\"></span></span><span style=\"display:inline-block;position:relative;padding-right:0.1em;margin-right:0.1em;\">こ<span style=\"display:block;user-select:none;pointer-events:none;position:absolute;top:0.1em;left:0;right:0;height:0;border-top:0.1em solid;right:-0.1em;height:0.4em;border-right:0.1em solid;\"></span></span><span style=\"display:inline-block;position:relative;\">む<span style=\"\"></span></span></span></li></ol>",
         "pitch-accent-graphs": "<ol><li><svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 250 100\" style=\"display:inline-block;height:2em;\">\n    <defs>\n        <g id=\"term-pitch-accent-graph-dot\"><circle cx=\"0\" cy=\"0\" r=\"15\" style=\"fill:#000;stroke:#000;stroke-width:5;\" /></g>\n        <g id=\"term-pitch-accent-graph-dot-downstep\"><circle cx=\"0\" cy=\"0\" r=\"15\" style=\"fill:none;stroke:#000;stroke-width:5;\" /><circle cx=\"0\" cy=\"0\" r=\"5\" style=\"fill:none;stroke:#000;stroke-width:5;\" /></g>\n        <g id=\"term-pitch-accent-graph-triangle\"><path d=\"M0 13 L15 -13 L-15 -13 Z\" style=\"fill:none;stroke:#000;stroke-width:5;\" /></g>\n    </defs>\n    <path style=\"fill:none;stroke:#000;stroke-width:5;\" d=\"M25 75L75 25L125 25L175 25\"></path>\n    <path style=\"fill:none;stroke:#000;stroke-width:5;stroke-dasharray:5 5;\" d=\"M175 25 L225 25\"></path>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"25\" y=\"75\"></use>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"75\" y=\"25\"></use>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"125\" y=\"25\"></use>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"175\" y=\"25\"></use>\n    <use href=\"#term-pitch-accent-graph-triangle\" x=\"225\" y=\"25\"></use>\n</svg></li><li><svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 250 100\" style=\"display:inline-block;height:2em;\">\n    <defs>\n        <g id=\"term-pitch-accent-graph-dot\"><circle cx=\"0\" cy=\"0\" r=\"15\" style=\"fill:#000;stroke:#000;stroke-width:5;\" /></g>\n        <g id=\"term-pitch-accent-graph-dot-downstep\"><circle cx=\"0\" cy=\"0\" r=\"15\" style=\"fill:none;stroke:#000;stroke-width:5;\" /><circle cx=\"0\" cy=\"0\" r=\"5\" style=\"fill:none;stroke:#000;stroke-width:5;\" /></g>\n        <g id=\"term-pitch-accent-graph-triangle\"><path d=\"M0 13 L15 -13 L-15 -13 Z\" style=\"fill:none;stroke:#000;stroke-width:5;\" /></g>\n    </defs>\n    <path style=\"fill:none;stroke:#000;stroke-width:5;\" d=\"M25 75L75 25L125 25L175 75\"></path>\n    <path style=\"fill:none;stroke:#000;stroke-width:5;stroke-dasharray:5 5;\" d=\"M175 75 L225 75\"></path>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"25\" y=\"75\"></use>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"75\" y=\"25\"></use>\n    <use href=\"#term-pitch-accent-graph-dot-downstep\" x=\"125\" y=\"25\"></use>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"175\" y=\"75\"></use>\n    <use href=\"#term-pitch-accent-graph-triangle\" x=\"225\" y=\"75\"></use>\n</svg></li></ol>",
@@ -1388,7 +1388,7 @@
         "screenshot": "<img src=\"\" />",
         "search-query": "fullQuery",
         "sentence": "cloze-prefix打ち込んでいませんでしたcloze-suffix",
-        "tags": "tag1, tag2",
+        "tags": "vt",
         "url": "<a href=\"url:\">url:</a>"
       },
       {
@@ -1405,9 +1405,9 @@
         "frequencies": "<ul style=\"text-align: left;\"><li>Test Dictionary 2: 3</li><li>Test Dictionary 2: 9</li></ul>",
         "furigana": "<ruby>打<rt>ぶ</rt></ruby>ち<ruby>込<rt>こ</rt></ruby>む",
         "furigana-plain": "打[ぶ]ち 込[こ]む",
-        "glossary": "<div style=\"text-align: left;\"><i>(tag1, tag2, Test Dictionary 2)</i> <ul><li>definition17</li><li>definition18</li></ul></div>",
-        "glossary-brief": "<div style=\"text-align: left;\"><ul><li>definition17</li><li>definition18</li></ul></div>",
-        "glossary-no-dictionary": "<div style=\"text-align: left;\"><i>(tag1, tag2)</i> <ul><li>definition17</li><li>definition18</li></ul></div>",
+        "glossary": "<div style=\"text-align: left;\"><i>(vt, Test Dictionary 2)</i> <ul><li>buchikomu definition 1</li><li>buchikomu definition 2</li></ul></div>",
+        "glossary-brief": "<div style=\"text-align: left;\"><ul><li>buchikomu definition 1</li><li>buchikomu definition 2</li></ul></div>",
+        "glossary-no-dictionary": "<div style=\"text-align: left;\"><i>(vt)</i> <ul><li>buchikomu definition 1</li><li>buchikomu definition 2</li></ul></div>",
         "part-of-speech": "Godan verb",
         "pitch-accents": "<ol><li><span><span style=\"display:inline-block;position:relative;\">ぶ<span style=\"\"></span></span><span style=\"display:inline-block;position:relative;\">ち<span style=\"display:block;user-select:none;pointer-events:none;position:absolute;top:0.1em;left:0;right:0;height:0;border-top:0.1em solid;\"></span></span><span style=\"display:inline-block;position:relative;\">こ<span style=\"display:block;user-select:none;pointer-events:none;position:absolute;top:0.1em;left:0;right:0;height:0;border-top:0.1em solid;\"></span></span><span style=\"display:inline-block;position:relative;\">む<span style=\"display:block;user-select:none;pointer-events:none;position:absolute;top:0.1em;left:0;right:0;height:0;border-top:0.1em solid;\"></span></span></span></li><li><span><span style=\"display:inline-block;position:relative;\">ぶ<span style=\"\"></span></span><span style=\"display:inline-block;position:relative;\">ち<span style=\"display:block;user-select:none;pointer-events:none;position:absolute;top:0.1em;left:0;right:0;height:0;border-top:0.1em solid;\"></span></span><span style=\"display:inline-block;position:relative;padding-right:0.1em;margin-right:0.1em;\">こ<span style=\"display:block;user-select:none;pointer-events:none;position:absolute;top:0.1em;left:0;right:0;height:0;border-top:0.1em solid;right:-0.1em;height:0.4em;border-right:0.1em solid;\"></span></span><span style=\"display:inline-block;position:relative;\">む<span style=\"\"></span></span></span></li></ol>",
         "pitch-accent-graphs": "<ol><li><svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 250 100\" style=\"display:inline-block;height:2em;\">\n    <defs>\n        <g id=\"term-pitch-accent-graph-dot\"><circle cx=\"0\" cy=\"0\" r=\"15\" style=\"fill:#000;stroke:#000;stroke-width:5;\" /></g>\n        <g id=\"term-pitch-accent-graph-dot-downstep\"><circle cx=\"0\" cy=\"0\" r=\"15\" style=\"fill:none;stroke:#000;stroke-width:5;\" /><circle cx=\"0\" cy=\"0\" r=\"5\" style=\"fill:none;stroke:#000;stroke-width:5;\" /></g>\n        <g id=\"term-pitch-accent-graph-triangle\"><path d=\"M0 13 L15 -13 L-15 -13 Z\" style=\"fill:none;stroke:#000;stroke-width:5;\" /></g>\n    </defs>\n    <path style=\"fill:none;stroke:#000;stroke-width:5;\" d=\"M25 75L75 25L125 25L175 25\"></path>\n    <path style=\"fill:none;stroke:#000;stroke-width:5;stroke-dasharray:5 5;\" d=\"M175 25 L225 25\"></path>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"25\" y=\"75\"></use>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"75\" y=\"25\"></use>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"125\" y=\"25\"></use>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"175\" y=\"25\"></use>\n    <use href=\"#term-pitch-accent-graph-triangle\" x=\"225\" y=\"25\"></use>\n</svg></li><li><svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 250 100\" style=\"display:inline-block;height:2em;\">\n    <defs>\n        <g id=\"term-pitch-accent-graph-dot\"><circle cx=\"0\" cy=\"0\" r=\"15\" style=\"fill:#000;stroke:#000;stroke-width:5;\" /></g>\n        <g id=\"term-pitch-accent-graph-dot-downstep\"><circle cx=\"0\" cy=\"0\" r=\"15\" style=\"fill:none;stroke:#000;stroke-width:5;\" /><circle cx=\"0\" cy=\"0\" r=\"5\" style=\"fill:none;stroke:#000;stroke-width:5;\" /></g>\n        <g id=\"term-pitch-accent-graph-triangle\"><path d=\"M0 13 L15 -13 L-15 -13 Z\" style=\"fill:none;stroke:#000;stroke-width:5;\" /></g>\n    </defs>\n    <path style=\"fill:none;stroke:#000;stroke-width:5;\" d=\"M25 75L75 25L125 25L175 75\"></path>\n    <path style=\"fill:none;stroke:#000;stroke-width:5;stroke-dasharray:5 5;\" d=\"M175 75 L225 75\"></path>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"25\" y=\"75\"></use>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"75\" y=\"25\"></use>\n    <use href=\"#term-pitch-accent-graph-dot-downstep\" x=\"125\" y=\"25\"></use>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"175\" y=\"75\"></use>\n    <use href=\"#term-pitch-accent-graph-triangle\" x=\"225\" y=\"75\"></use>\n</svg></li></ol>",
@@ -1416,7 +1416,7 @@
         "screenshot": "<img src=\"\" />",
         "search-query": "fullQuery",
         "sentence": "cloze-prefix打ち込んでいませんでしたcloze-suffix",
-        "tags": "tag1, tag2",
+        "tags": "vt",
         "url": "<a href=\"url:\">url:</a>"
       },
       {
@@ -1433,9 +1433,9 @@
         "frequencies": "<ul style=\"text-align: left;\"><li>Test Dictionary 2: 3</li><li>Test Dictionary 2: 8</li></ul>",
         "furigana": "<ruby>打<rt>う</rt></ruby>ち<ruby>込<rt>こ</rt></ruby>む",
         "furigana-plain": "打[う]ち 込[こ]む",
-        "glossary": "<div style=\"text-align: left;\"><i>(tag1, tag2, Test Dictionary 2)</i> <ul><li>definition15</li><li>definition16</li></ul></div>",
-        "glossary-brief": "<div style=\"text-align: left;\"><ul><li>definition15</li><li>definition16</li></ul></div>",
-        "glossary-no-dictionary": "<div style=\"text-align: left;\"><i>(tag1, tag2)</i> <ul><li>definition15</li><li>definition16</li></ul></div>",
+        "glossary": "<div style=\"text-align: left;\"><i>(vt, Test Dictionary 2)</i> <ul><li>uchikomu definition 3</li><li>uchikomu definition 4</li></ul></div>",
+        "glossary-brief": "<div style=\"text-align: left;\"><ul><li>uchikomu definition 3</li><li>uchikomu definition 4</li></ul></div>",
+        "glossary-no-dictionary": "<div style=\"text-align: left;\"><i>(vt)</i> <ul><li>uchikomu definition 3</li><li>uchikomu definition 4</li></ul></div>",
         "part-of-speech": "Godan verb",
         "pitch-accents": "<ol><li><span><span style=\"display:inline-block;position:relative;\">う<span style=\"\"></span></span><span style=\"display:inline-block;position:relative;\">ち<span style=\"display:block;user-select:none;pointer-events:none;position:absolute;top:0.1em;left:0;right:0;height:0;border-top:0.1em solid;\"></span></span><span style=\"display:inline-block;position:relative;\">こ<span style=\"display:block;user-select:none;pointer-events:none;position:absolute;top:0.1em;left:0;right:0;height:0;border-top:0.1em solid;\"></span></span><span style=\"display:inline-block;position:relative;\">む<span style=\"display:block;user-select:none;pointer-events:none;position:absolute;top:0.1em;left:0;right:0;height:0;border-top:0.1em solid;\"></span></span></span></li><li><span><span style=\"display:inline-block;position:relative;\">う<span style=\"\"></span></span><span style=\"display:inline-block;position:relative;\">ち<span style=\"display:block;user-select:none;pointer-events:none;position:absolute;top:0.1em;left:0;right:0;height:0;border-top:0.1em solid;\"></span></span><span style=\"display:inline-block;position:relative;padding-right:0.1em;margin-right:0.1em;\">こ<span style=\"display:block;user-select:none;pointer-events:none;position:absolute;top:0.1em;left:0;right:0;height:0;border-top:0.1em solid;right:-0.1em;height:0.4em;border-right:0.1em solid;\"></span></span><span style=\"display:inline-block;position:relative;\">む<span style=\"\"></span></span></span></li></ol>",
         "pitch-accent-graphs": "<ol><li><svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 250 100\" style=\"display:inline-block;height:2em;\">\n    <defs>\n        <g id=\"term-pitch-accent-graph-dot\"><circle cx=\"0\" cy=\"0\" r=\"15\" style=\"fill:#000;stroke:#000;stroke-width:5;\" /></g>\n        <g id=\"term-pitch-accent-graph-dot-downstep\"><circle cx=\"0\" cy=\"0\" r=\"15\" style=\"fill:none;stroke:#000;stroke-width:5;\" /><circle cx=\"0\" cy=\"0\" r=\"5\" style=\"fill:none;stroke:#000;stroke-width:5;\" /></g>\n        <g id=\"term-pitch-accent-graph-triangle\"><path d=\"M0 13 L15 -13 L-15 -13 Z\" style=\"fill:none;stroke:#000;stroke-width:5;\" /></g>\n    </defs>\n    <path style=\"fill:none;stroke:#000;stroke-width:5;\" d=\"M25 75L75 25L125 25L175 25\"></path>\n    <path style=\"fill:none;stroke:#000;stroke-width:5;stroke-dasharray:5 5;\" d=\"M175 25 L225 25\"></path>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"25\" y=\"75\"></use>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"75\" y=\"25\"></use>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"125\" y=\"25\"></use>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"175\" y=\"25\"></use>\n    <use href=\"#term-pitch-accent-graph-triangle\" x=\"225\" y=\"25\"></use>\n</svg></li><li><svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 250 100\" style=\"display:inline-block;height:2em;\">\n    <defs>\n        <g id=\"term-pitch-accent-graph-dot\"><circle cx=\"0\" cy=\"0\" r=\"15\" style=\"fill:#000;stroke:#000;stroke-width:5;\" /></g>\n        <g id=\"term-pitch-accent-graph-dot-downstep\"><circle cx=\"0\" cy=\"0\" r=\"15\" style=\"fill:none;stroke:#000;stroke-width:5;\" /><circle cx=\"0\" cy=\"0\" r=\"5\" style=\"fill:none;stroke:#000;stroke-width:5;\" /></g>\n        <g id=\"term-pitch-accent-graph-triangle\"><path d=\"M0 13 L15 -13 L-15 -13 Z\" style=\"fill:none;stroke:#000;stroke-width:5;\" /></g>\n    </defs>\n    <path style=\"fill:none;stroke:#000;stroke-width:5;\" d=\"M25 75L75 25L125 25L175 75\"></path>\n    <path style=\"fill:none;stroke:#000;stroke-width:5;stroke-dasharray:5 5;\" d=\"M175 75 L225 75\"></path>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"25\" y=\"75\"></use>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"75\" y=\"25\"></use>\n    <use href=\"#term-pitch-accent-graph-dot-downstep\" x=\"125\" y=\"25\"></use>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"175\" y=\"75\"></use>\n    <use href=\"#term-pitch-accent-graph-triangle\" x=\"225\" y=\"75\"></use>\n</svg></li></ol>",
@@ -1444,7 +1444,7 @@
         "screenshot": "<img src=\"\" />",
         "search-query": "fullQuery",
         "sentence": "cloze-prefix打ち込んでいませんでしたcloze-suffix",
-        "tags": "tag1, tag2",
+        "tags": "vt",
         "url": "<a href=\"url:\">url:</a>"
       },
       {
@@ -1461,9 +1461,9 @@
         "frequencies": "<ul style=\"text-align: left;\"><li>Test Dictionary 2: 3</li><li>Test Dictionary 2: 9</li></ul>",
         "furigana": "<ruby>打<rt>ぶ</rt></ruby>ち<ruby>込<rt>こ</rt></ruby>む",
         "furigana-plain": "打[ぶ]ち 込[こ]む",
-        "glossary": "<div style=\"text-align: left;\"><i>(tag1, tag2, Test Dictionary 2)</i> <ul><li>definition19</li><li>definition20</li></ul></div>",
-        "glossary-brief": "<div style=\"text-align: left;\"><ul><li>definition19</li><li>definition20</li></ul></div>",
-        "glossary-no-dictionary": "<div style=\"text-align: left;\"><i>(tag1, tag2)</i> <ul><li>definition19</li><li>definition20</li></ul></div>",
+        "glossary": "<div style=\"text-align: left;\"><i>(vt, Test Dictionary 2)</i> <ul><li>buchikomu definition 3</li><li>buchikomu definition 4</li></ul></div>",
+        "glossary-brief": "<div style=\"text-align: left;\"><ul><li>buchikomu definition 3</li><li>buchikomu definition 4</li></ul></div>",
+        "glossary-no-dictionary": "<div style=\"text-align: left;\"><i>(vt)</i> <ul><li>buchikomu definition 3</li><li>buchikomu definition 4</li></ul></div>",
         "part-of-speech": "Godan verb",
         "pitch-accents": "<ol><li><span><span style=\"display:inline-block;position:relative;\">ぶ<span style=\"\"></span></span><span style=\"display:inline-block;position:relative;\">ち<span style=\"display:block;user-select:none;pointer-events:none;position:absolute;top:0.1em;left:0;right:0;height:0;border-top:0.1em solid;\"></span></span><span style=\"display:inline-block;position:relative;\">こ<span style=\"display:block;user-select:none;pointer-events:none;position:absolute;top:0.1em;left:0;right:0;height:0;border-top:0.1em solid;\"></span></span><span style=\"display:inline-block;position:relative;\">む<span style=\"display:block;user-select:none;pointer-events:none;position:absolute;top:0.1em;left:0;right:0;height:0;border-top:0.1em solid;\"></span></span></span></li><li><span><span style=\"display:inline-block;position:relative;\">ぶ<span style=\"\"></span></span><span style=\"display:inline-block;position:relative;\">ち<span style=\"display:block;user-select:none;pointer-events:none;position:absolute;top:0.1em;left:0;right:0;height:0;border-top:0.1em solid;\"></span></span><span style=\"display:inline-block;position:relative;padding-right:0.1em;margin-right:0.1em;\">こ<span style=\"display:block;user-select:none;pointer-events:none;position:absolute;top:0.1em;left:0;right:0;height:0;border-top:0.1em solid;right:-0.1em;height:0.4em;border-right:0.1em solid;\"></span></span><span style=\"display:inline-block;position:relative;\">む<span style=\"\"></span></span></span></li></ol>",
         "pitch-accent-graphs": "<ol><li><svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 250 100\" style=\"display:inline-block;height:2em;\">\n    <defs>\n        <g id=\"term-pitch-accent-graph-dot\"><circle cx=\"0\" cy=\"0\" r=\"15\" style=\"fill:#000;stroke:#000;stroke-width:5;\" /></g>\n        <g id=\"term-pitch-accent-graph-dot-downstep\"><circle cx=\"0\" cy=\"0\" r=\"15\" style=\"fill:none;stroke:#000;stroke-width:5;\" /><circle cx=\"0\" cy=\"0\" r=\"5\" style=\"fill:none;stroke:#000;stroke-width:5;\" /></g>\n        <g id=\"term-pitch-accent-graph-triangle\"><path d=\"M0 13 L15 -13 L-15 -13 Z\" style=\"fill:none;stroke:#000;stroke-width:5;\" /></g>\n    </defs>\n    <path style=\"fill:none;stroke:#000;stroke-width:5;\" d=\"M25 75L75 25L125 25L175 25\"></path>\n    <path style=\"fill:none;stroke:#000;stroke-width:5;stroke-dasharray:5 5;\" d=\"M175 25 L225 25\"></path>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"25\" y=\"75\"></use>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"75\" y=\"25\"></use>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"125\" y=\"25\"></use>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"175\" y=\"25\"></use>\n    <use href=\"#term-pitch-accent-graph-triangle\" x=\"225\" y=\"25\"></use>\n</svg></li><li><svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 250 100\" style=\"display:inline-block;height:2em;\">\n    <defs>\n        <g id=\"term-pitch-accent-graph-dot\"><circle cx=\"0\" cy=\"0\" r=\"15\" style=\"fill:#000;stroke:#000;stroke-width:5;\" /></g>\n        <g id=\"term-pitch-accent-graph-dot-downstep\"><circle cx=\"0\" cy=\"0\" r=\"15\" style=\"fill:none;stroke:#000;stroke-width:5;\" /><circle cx=\"0\" cy=\"0\" r=\"5\" style=\"fill:none;stroke:#000;stroke-width:5;\" /></g>\n        <g id=\"term-pitch-accent-graph-triangle\"><path d=\"M0 13 L15 -13 L-15 -13 Z\" style=\"fill:none;stroke:#000;stroke-width:5;\" /></g>\n    </defs>\n    <path style=\"fill:none;stroke:#000;stroke-width:5;\" d=\"M25 75L75 25L125 25L175 75\"></path>\n    <path style=\"fill:none;stroke:#000;stroke-width:5;stroke-dasharray:5 5;\" d=\"M175 75 L225 75\"></path>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"25\" y=\"75\"></use>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"75\" y=\"25\"></use>\n    <use href=\"#term-pitch-accent-graph-dot-downstep\" x=\"125\" y=\"25\"></use>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"175\" y=\"75\"></use>\n    <use href=\"#term-pitch-accent-graph-triangle\" x=\"225\" y=\"75\"></use>\n</svg></li></ol>",
@@ -1472,7 +1472,7 @@
         "screenshot": "<img src=\"\" />",
         "search-query": "fullQuery",
         "sentence": "cloze-prefix打ち込んでいませんでしたcloze-suffix",
-        "tags": "tag1, tag2",
+        "tags": "vt",
         "url": "<a href=\"url:\">url:</a>"
       },
       {
@@ -1489,9 +1489,9 @@
         "frequencies": "<ul style=\"text-align: left;\"><li>Test Dictionary 2: 2</li><li>Test Dictionary 2: 6</li></ul>",
         "furigana": "<ruby>打<rt>う</rt></ruby>つ",
         "furigana-plain": "打[う]つ",
-        "glossary": "<div style=\"text-align: left;\"><i>(tag1, tag2, Test Dictionary 2)</i> <ul><li>definition5</li><li>definition6</li></ul></div>",
-        "glossary-brief": "<div style=\"text-align: left;\"><ul><li>definition5</li><li>definition6</li></ul></div>",
-        "glossary-no-dictionary": "<div style=\"text-align: left;\"><i>(tag1, tag2)</i> <ul><li>definition5</li><li>definition6</li></ul></div>",
+        "glossary": "<div style=\"text-align: left;\"><i>(vt, Test Dictionary 2)</i> <ul><li>utsu definition 1</li><li>utsu definition 2</li></ul></div>",
+        "glossary-brief": "<div style=\"text-align: left;\"><ul><li>utsu definition 1</li><li>utsu definition 2</li></ul></div>",
+        "glossary-no-dictionary": "<div style=\"text-align: left;\"><i>(vt)</i> <ul><li>utsu definition 1</li><li>utsu definition 2</li></ul></div>",
         "part-of-speech": "Godan verb",
         "pitch-accents": "No pitch accent data",
         "pitch-accent-graphs": "No pitch accent data",
@@ -1500,7 +1500,7 @@
         "screenshot": "<img src=\"\" />",
         "search-query": "fullQuery",
         "sentence": "cloze-prefix打ちcloze-suffix",
-        "tags": "tag1, tag2",
+        "tags": "vt",
         "url": "<a href=\"url:\">url:</a>"
       },
       {
@@ -1517,9 +1517,9 @@
         "frequencies": "<ul style=\"text-align: left;\"><li>Test Dictionary 2: 2</li><li>Test Dictionary 2: 7</li></ul>",
         "furigana": "<ruby>打<rt>ぶ</rt></ruby>つ",
         "furigana-plain": "打[ぶ]つ",
-        "glossary": "<div style=\"text-align: left;\"><i>(tag1, tag2, Test Dictionary 2)</i> <ul><li>definition9</li><li>definition10</li></ul></div>",
-        "glossary-brief": "<div style=\"text-align: left;\"><ul><li>definition9</li><li>definition10</li></ul></div>",
-        "glossary-no-dictionary": "<div style=\"text-align: left;\"><i>(tag1, tag2)</i> <ul><li>definition9</li><li>definition10</li></ul></div>",
+        "glossary": "<div style=\"text-align: left;\"><i>(vt, Test Dictionary 2)</i> <ul><li>butsu definition 1</li><li>butsu definition 2</li></ul></div>",
+        "glossary-brief": "<div style=\"text-align: left;\"><ul><li>butsu definition 1</li><li>butsu definition 2</li></ul></div>",
+        "glossary-no-dictionary": "<div style=\"text-align: left;\"><i>(vt)</i> <ul><li>butsu definition 1</li><li>butsu definition 2</li></ul></div>",
         "part-of-speech": "Godan verb",
         "pitch-accents": "No pitch accent data",
         "pitch-accent-graphs": "No pitch accent data",
@@ -1528,7 +1528,7 @@
         "screenshot": "<img src=\"\" />",
         "search-query": "fullQuery",
         "sentence": "cloze-prefix打ちcloze-suffix",
-        "tags": "tag1, tag2",
+        "tags": "vt",
         "url": "<a href=\"url:\">url:</a>"
       },
       {
@@ -1545,9 +1545,9 @@
         "frequencies": "<ul style=\"text-align: left;\"><li>Test Dictionary 2: 2</li><li>Test Dictionary 2: 6</li></ul>",
         "furigana": "<ruby>打<rt>う</rt></ruby>つ",
         "furigana-plain": "打[う]つ",
-        "glossary": "<div style=\"text-align: left;\"><i>(tag1, tag2, Test Dictionary 2)</i> <ul><li>definition7</li><li>definition8</li></ul></div>",
-        "glossary-brief": "<div style=\"text-align: left;\"><ul><li>definition7</li><li>definition8</li></ul></div>",
-        "glossary-no-dictionary": "<div style=\"text-align: left;\"><i>(tag1, tag2)</i> <ul><li>definition7</li><li>definition8</li></ul></div>",
+        "glossary": "<div style=\"text-align: left;\"><i>(vt, Test Dictionary 2)</i> <ul><li>utsu definition 3</li><li>utsu definition 4</li></ul></div>",
+        "glossary-brief": "<div style=\"text-align: left;\"><ul><li>utsu definition 3</li><li>utsu definition 4</li></ul></div>",
+        "glossary-no-dictionary": "<div style=\"text-align: left;\"><i>(vt)</i> <ul><li>utsu definition 3</li><li>utsu definition 4</li></ul></div>",
         "part-of-speech": "Godan verb",
         "pitch-accents": "No pitch accent data",
         "pitch-accent-graphs": "No pitch accent data",
@@ -1556,7 +1556,7 @@
         "screenshot": "<img src=\"\" />",
         "search-query": "fullQuery",
         "sentence": "cloze-prefix打ちcloze-suffix",
-        "tags": "tag1, tag2",
+        "tags": "vt",
         "url": "<a href=\"url:\">url:</a>"
       },
       {
@@ -1573,9 +1573,9 @@
         "frequencies": "<ul style=\"text-align: left;\"><li>Test Dictionary 2: 2</li><li>Test Dictionary 2: 7</li></ul>",
         "furigana": "<ruby>打<rt>ぶ</rt></ruby>つ",
         "furigana-plain": "打[ぶ]つ",
-        "glossary": "<div style=\"text-align: left;\"><i>(tag1, tag2, Test Dictionary 2)</i> <ul><li>definition11</li><li>definition12</li></ul></div>",
-        "glossary-brief": "<div style=\"text-align: left;\"><ul><li>definition11</li><li>definition12</li></ul></div>",
-        "glossary-no-dictionary": "<div style=\"text-align: left;\"><i>(tag1, tag2)</i> <ul><li>definition11</li><li>definition12</li></ul></div>",
+        "glossary": "<div style=\"text-align: left;\"><i>(vt, Test Dictionary 2)</i> <ul><li>butsu definition 3</li><li>butsu definition 4</li></ul></div>",
+        "glossary-brief": "<div style=\"text-align: left;\"><ul><li>butsu definition 3</li><li>butsu definition 4</li></ul></div>",
+        "glossary-no-dictionary": "<div style=\"text-align: left;\"><i>(vt)</i> <ul><li>butsu definition 3</li><li>butsu definition 4</li></ul></div>",
         "part-of-speech": "Godan verb",
         "pitch-accents": "No pitch accent data",
         "pitch-accent-graphs": "No pitch accent data",
@@ -1584,7 +1584,7 @@
         "screenshot": "<img src=\"\" />",
         "search-query": "fullQuery",
         "sentence": "cloze-prefix打ちcloze-suffix",
-        "tags": "tag1, tag2",
+        "tags": "vt",
         "url": "<a href=\"url:\">url:</a>"
       },
       {
@@ -1601,10 +1601,10 @@
         "frequencies": "<ul style=\"text-align: left;\"><li>Test Dictionary 2: 1</li><li>Test Dictionary 2: 4</li></ul>",
         "furigana": "<ruby>打<rt>だ</rt></ruby>",
         "furigana-plain": "打[だ]",
-        "glossary": "<div style=\"text-align: left;\"><i>(tag1, tag2, Test Dictionary 2)</i> <ul><li>definition1</li><li>definition2</li></ul></div>",
-        "glossary-brief": "<div style=\"text-align: left;\"><ul><li>definition1</li><li>definition2</li></ul></div>",
-        "glossary-no-dictionary": "<div style=\"text-align: left;\"><i>(tag1, tag2)</i> <ul><li>definition1</li><li>definition2</li></ul></div>",
-        "part-of-speech": "Unknown",
+        "glossary": "<div style=\"text-align: left;\"><i>(n, Test Dictionary 2)</i> <ul><li>da definition 1</li><li>da definition 2</li></ul></div>",
+        "glossary-brief": "<div style=\"text-align: left;\"><ul><li>da definition 1</li><li>da definition 2</li></ul></div>",
+        "glossary-no-dictionary": "<div style=\"text-align: left;\"><i>(n)</i> <ul><li>da definition 1</li><li>da definition 2</li></ul></div>",
+        "part-of-speech": "Noun",
         "pitch-accents": "No pitch accent data",
         "pitch-accent-graphs": "No pitch accent data",
         "pitch-accent-positions": "No pitch accent data",
@@ -1612,7 +1612,7 @@
         "screenshot": "<img src=\"\" />",
         "search-query": "fullQuery",
         "sentence": "cloze-prefix打cloze-suffix",
-        "tags": "tag1, tag2",
+        "tags": "n",
         "url": "<a href=\"url:\">url:</a>"
       },
       {
@@ -1629,10 +1629,10 @@
         "frequencies": "<ul style=\"text-align: left;\"><li>Test Dictionary 2: 1</li><li>Test Dictionary 2: 5</li></ul>",
         "furigana": "<ruby>打<rt>ダース</rt></ruby>",
         "furigana-plain": "打[ダース]",
-        "glossary": "<div style=\"text-align: left;\"><i>(tag1, tag2, Test Dictionary 2)</i> <ul><li>definition3</li><li>definition4</li></ul></div>",
-        "glossary-brief": "<div style=\"text-align: left;\"><ul><li>definition3</li><li>definition4</li></ul></div>",
-        "glossary-no-dictionary": "<div style=\"text-align: left;\"><i>(tag1, tag2)</i> <ul><li>definition3</li><li>definition4</li></ul></div>",
-        "part-of-speech": "Unknown",
+        "glossary": "<div style=\"text-align: left;\"><i>(abbr, n, Test Dictionary 2)</i> <ul><li>daasu definition 1</li><li>daasu definition 2</li></ul></div>",
+        "glossary-brief": "<div style=\"text-align: left;\"><ul><li>daasu definition 1</li><li>daasu definition 2</li></ul></div>",
+        "glossary-no-dictionary": "<div style=\"text-align: left;\"><i>(abbr, n)</i> <ul><li>daasu definition 1</li><li>daasu definition 2</li></ul></div>",
+        "part-of-speech": "Noun",
         "pitch-accents": "No pitch accent data",
         "pitch-accent-graphs": "No pitch accent data",
         "pitch-accent-positions": "No pitch accent data",
@@ -1640,7 +1640,7 @@
         "screenshot": "<img src=\"\" />",
         "search-query": "fullQuery",
         "sentence": "cloze-prefix打cloze-suffix",
-        "tags": "tag1, tag2",
+        "tags": "abbr, n",
         "url": "<a href=\"url:\">url:</a>"
       }
     ]
@@ -1662,9 +1662,9 @@
         "frequencies": "<ul style=\"text-align: left;\"><li>Test Dictionary 2: 3</li><li>Test Dictionary 2: 8</li></ul>",
         "furigana": "<ruby>打<rt>う</rt></ruby>ち<ruby>込<rt>こ</rt></ruby>む",
         "furigana-plain": "打[う]ち 込[こ]む",
-        "glossary": "<div style=\"text-align: left;\"><i>(tag1, tag2, Test Dictionary 2)</i> <ul><li>definition13</li><li>definition14</li></ul></div>",
-        "glossary-brief": "<div style=\"text-align: left;\"><ul><li>definition13</li><li>definition14</li></ul></div>",
-        "glossary-no-dictionary": "<div style=\"text-align: left;\"><i>(tag1, tag2)</i> <ul><li>definition13</li><li>definition14</li></ul></div>",
+        "glossary": "<div style=\"text-align: left;\"><i>(vt, Test Dictionary 2)</i> <ul><li>uchikomu definition 1</li><li>uchikomu definition 2</li></ul></div>",
+        "glossary-brief": "<div style=\"text-align: left;\"><ul><li>uchikomu definition 1</li><li>uchikomu definition 2</li></ul></div>",
+        "glossary-no-dictionary": "<div style=\"text-align: left;\"><i>(vt)</i> <ul><li>uchikomu definition 1</li><li>uchikomu definition 2</li></ul></div>",
         "part-of-speech": "Godan verb",
         "pitch-accents": "<ol><li><span><span style=\"display:inline-block;position:relative;\">う<span style=\"\"></span></span><span style=\"display:inline-block;position:relative;\">ち<span style=\"display:block;user-select:none;pointer-events:none;position:absolute;top:0.1em;left:0;right:0;height:0;border-top:0.1em solid;\"></span></span><span style=\"display:inline-block;position:relative;\">こ<span style=\"display:block;user-select:none;pointer-events:none;position:absolute;top:0.1em;left:0;right:0;height:0;border-top:0.1em solid;\"></span></span><span style=\"display:inline-block;position:relative;\">む<span style=\"display:block;user-select:none;pointer-events:none;position:absolute;top:0.1em;left:0;right:0;height:0;border-top:0.1em solid;\"></span></span></span></li><li><span><span style=\"display:inline-block;position:relative;\">う<span style=\"\"></span></span><span style=\"display:inline-block;position:relative;\">ち<span style=\"display:block;user-select:none;pointer-events:none;position:absolute;top:0.1em;left:0;right:0;height:0;border-top:0.1em solid;\"></span></span><span style=\"display:inline-block;position:relative;padding-right:0.1em;margin-right:0.1em;\">こ<span style=\"display:block;user-select:none;pointer-events:none;position:absolute;top:0.1em;left:0;right:0;height:0;border-top:0.1em solid;right:-0.1em;height:0.4em;border-right:0.1em solid;\"></span></span><span style=\"display:inline-block;position:relative;\">む<span style=\"\"></span></span></span></li></ol>",
         "pitch-accent-graphs": "<ol><li><svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 250 100\" style=\"display:inline-block;height:2em;\">\n    <defs>\n        <g id=\"term-pitch-accent-graph-dot\"><circle cx=\"0\" cy=\"0\" r=\"15\" style=\"fill:#000;stroke:#000;stroke-width:5;\" /></g>\n        <g id=\"term-pitch-accent-graph-dot-downstep\"><circle cx=\"0\" cy=\"0\" r=\"15\" style=\"fill:none;stroke:#000;stroke-width:5;\" /><circle cx=\"0\" cy=\"0\" r=\"5\" style=\"fill:none;stroke:#000;stroke-width:5;\" /></g>\n        <g id=\"term-pitch-accent-graph-triangle\"><path d=\"M0 13 L15 -13 L-15 -13 Z\" style=\"fill:none;stroke:#000;stroke-width:5;\" /></g>\n    </defs>\n    <path style=\"fill:none;stroke:#000;stroke-width:5;\" d=\"M25 75L75 25L125 25L175 25\"></path>\n    <path style=\"fill:none;stroke:#000;stroke-width:5;stroke-dasharray:5 5;\" d=\"M175 25 L225 25\"></path>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"25\" y=\"75\"></use>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"75\" y=\"25\"></use>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"125\" y=\"25\"></use>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"175\" y=\"25\"></use>\n    <use href=\"#term-pitch-accent-graph-triangle\" x=\"225\" y=\"25\"></use>\n</svg></li><li><svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 250 100\" style=\"display:inline-block;height:2em;\">\n    <defs>\n        <g id=\"term-pitch-accent-graph-dot\"><circle cx=\"0\" cy=\"0\" r=\"15\" style=\"fill:#000;stroke:#000;stroke-width:5;\" /></g>\n        <g id=\"term-pitch-accent-graph-dot-downstep\"><circle cx=\"0\" cy=\"0\" r=\"15\" style=\"fill:none;stroke:#000;stroke-width:5;\" /><circle cx=\"0\" cy=\"0\" r=\"5\" style=\"fill:none;stroke:#000;stroke-width:5;\" /></g>\n        <g id=\"term-pitch-accent-graph-triangle\"><path d=\"M0 13 L15 -13 L-15 -13 Z\" style=\"fill:none;stroke:#000;stroke-width:5;\" /></g>\n    </defs>\n    <path style=\"fill:none;stroke:#000;stroke-width:5;\" d=\"M25 75L75 25L125 25L175 75\"></path>\n    <path style=\"fill:none;stroke:#000;stroke-width:5;stroke-dasharray:5 5;\" d=\"M175 75 L225 75\"></path>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"25\" y=\"75\"></use>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"75\" y=\"25\"></use>\n    <use href=\"#term-pitch-accent-graph-dot-downstep\" x=\"125\" y=\"25\"></use>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"175\" y=\"75\"></use>\n    <use href=\"#term-pitch-accent-graph-triangle\" x=\"225\" y=\"75\"></use>\n</svg></li></ol>",
@@ -1673,7 +1673,7 @@
         "screenshot": "<img src=\"\" />",
         "search-query": "fullQuery",
         "sentence": "cloze-prefix打(う)ち込(こ)むcloze-suffix",
-        "tags": "tag1, tag2",
+        "tags": "vt",
         "url": "<a href=\"url:\">url:</a>"
       },
       {
@@ -1690,9 +1690,9 @@
         "frequencies": "<ul style=\"text-align: left;\"><li>Test Dictionary 2: 3</li><li>Test Dictionary 2: 9</li></ul>",
         "furigana": "<ruby>打<rt>ぶ</rt></ruby>ち<ruby>込<rt>こ</rt></ruby>む",
         "furigana-plain": "打[ぶ]ち 込[こ]む",
-        "glossary": "<div style=\"text-align: left;\"><i>(tag1, tag2, Test Dictionary 2)</i> <ul><li>definition17</li><li>definition18</li></ul></div>",
-        "glossary-brief": "<div style=\"text-align: left;\"><ul><li>definition17</li><li>definition18</li></ul></div>",
-        "glossary-no-dictionary": "<div style=\"text-align: left;\"><i>(tag1, tag2)</i> <ul><li>definition17</li><li>definition18</li></ul></div>",
+        "glossary": "<div style=\"text-align: left;\"><i>(vt, Test Dictionary 2)</i> <ul><li>buchikomu definition 1</li><li>buchikomu definition 2</li></ul></div>",
+        "glossary-brief": "<div style=\"text-align: left;\"><ul><li>buchikomu definition 1</li><li>buchikomu definition 2</li></ul></div>",
+        "glossary-no-dictionary": "<div style=\"text-align: left;\"><i>(vt)</i> <ul><li>buchikomu definition 1</li><li>buchikomu definition 2</li></ul></div>",
         "part-of-speech": "Godan verb",
         "pitch-accents": "<ol><li><span><span style=\"display:inline-block;position:relative;\">ぶ<span style=\"\"></span></span><span style=\"display:inline-block;position:relative;\">ち<span style=\"display:block;user-select:none;pointer-events:none;position:absolute;top:0.1em;left:0;right:0;height:0;border-top:0.1em solid;\"></span></span><span style=\"display:inline-block;position:relative;\">こ<span style=\"display:block;user-select:none;pointer-events:none;position:absolute;top:0.1em;left:0;right:0;height:0;border-top:0.1em solid;\"></span></span><span style=\"display:inline-block;position:relative;\">む<span style=\"display:block;user-select:none;pointer-events:none;position:absolute;top:0.1em;left:0;right:0;height:0;border-top:0.1em solid;\"></span></span></span></li><li><span><span style=\"display:inline-block;position:relative;\">ぶ<span style=\"\"></span></span><span style=\"display:inline-block;position:relative;\">ち<span style=\"display:block;user-select:none;pointer-events:none;position:absolute;top:0.1em;left:0;right:0;height:0;border-top:0.1em solid;\"></span></span><span style=\"display:inline-block;position:relative;padding-right:0.1em;margin-right:0.1em;\">こ<span style=\"display:block;user-select:none;pointer-events:none;position:absolute;top:0.1em;left:0;right:0;height:0;border-top:0.1em solid;right:-0.1em;height:0.4em;border-right:0.1em solid;\"></span></span><span style=\"display:inline-block;position:relative;\">む<span style=\"\"></span></span></span></li></ol>",
         "pitch-accent-graphs": "<ol><li><svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 250 100\" style=\"display:inline-block;height:2em;\">\n    <defs>\n        <g id=\"term-pitch-accent-graph-dot\"><circle cx=\"0\" cy=\"0\" r=\"15\" style=\"fill:#000;stroke:#000;stroke-width:5;\" /></g>\n        <g id=\"term-pitch-accent-graph-dot-downstep\"><circle cx=\"0\" cy=\"0\" r=\"15\" style=\"fill:none;stroke:#000;stroke-width:5;\" /><circle cx=\"0\" cy=\"0\" r=\"5\" style=\"fill:none;stroke:#000;stroke-width:5;\" /></g>\n        <g id=\"term-pitch-accent-graph-triangle\"><path d=\"M0 13 L15 -13 L-15 -13 Z\" style=\"fill:none;stroke:#000;stroke-width:5;\" /></g>\n    </defs>\n    <path style=\"fill:none;stroke:#000;stroke-width:5;\" d=\"M25 75L75 25L125 25L175 25\"></path>\n    <path style=\"fill:none;stroke:#000;stroke-width:5;stroke-dasharray:5 5;\" d=\"M175 25 L225 25\"></path>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"25\" y=\"75\"></use>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"75\" y=\"25\"></use>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"125\" y=\"25\"></use>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"175\" y=\"25\"></use>\n    <use href=\"#term-pitch-accent-graph-triangle\" x=\"225\" y=\"25\"></use>\n</svg></li><li><svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 250 100\" style=\"display:inline-block;height:2em;\">\n    <defs>\n        <g id=\"term-pitch-accent-graph-dot\"><circle cx=\"0\" cy=\"0\" r=\"15\" style=\"fill:#000;stroke:#000;stroke-width:5;\" /></g>\n        <g id=\"term-pitch-accent-graph-dot-downstep\"><circle cx=\"0\" cy=\"0\" r=\"15\" style=\"fill:none;stroke:#000;stroke-width:5;\" /><circle cx=\"0\" cy=\"0\" r=\"5\" style=\"fill:none;stroke:#000;stroke-width:5;\" /></g>\n        <g id=\"term-pitch-accent-graph-triangle\"><path d=\"M0 13 L15 -13 L-15 -13 Z\" style=\"fill:none;stroke:#000;stroke-width:5;\" /></g>\n    </defs>\n    <path style=\"fill:none;stroke:#000;stroke-width:5;\" d=\"M25 75L75 25L125 25L175 75\"></path>\n    <path style=\"fill:none;stroke:#000;stroke-width:5;stroke-dasharray:5 5;\" d=\"M175 75 L225 75\"></path>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"25\" y=\"75\"></use>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"75\" y=\"25\"></use>\n    <use href=\"#term-pitch-accent-graph-dot-downstep\" x=\"125\" y=\"25\"></use>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"175\" y=\"75\"></use>\n    <use href=\"#term-pitch-accent-graph-triangle\" x=\"225\" y=\"75\"></use>\n</svg></li></ol>",
@@ -1701,7 +1701,7 @@
         "screenshot": "<img src=\"\" />",
         "search-query": "fullQuery",
         "sentence": "cloze-prefix打(う)ち込(こ)むcloze-suffix",
-        "tags": "tag1, tag2",
+        "tags": "vt",
         "url": "<a href=\"url:\">url:</a>"
       },
       {
@@ -1718,9 +1718,9 @@
         "frequencies": "<ul style=\"text-align: left;\"><li>Test Dictionary 2: 3</li><li>Test Dictionary 2: 8</li></ul>",
         "furigana": "<ruby>打<rt>う</rt></ruby>ち<ruby>込<rt>こ</rt></ruby>む",
         "furigana-plain": "打[う]ち 込[こ]む",
-        "glossary": "<div style=\"text-align: left;\"><i>(tag1, tag2, Test Dictionary 2)</i> <ul><li>definition15</li><li>definition16</li></ul></div>",
-        "glossary-brief": "<div style=\"text-align: left;\"><ul><li>definition15</li><li>definition16</li></ul></div>",
-        "glossary-no-dictionary": "<div style=\"text-align: left;\"><i>(tag1, tag2)</i> <ul><li>definition15</li><li>definition16</li></ul></div>",
+        "glossary": "<div style=\"text-align: left;\"><i>(vt, Test Dictionary 2)</i> <ul><li>uchikomu definition 3</li><li>uchikomu definition 4</li></ul></div>",
+        "glossary-brief": "<div style=\"text-align: left;\"><ul><li>uchikomu definition 3</li><li>uchikomu definition 4</li></ul></div>",
+        "glossary-no-dictionary": "<div style=\"text-align: left;\"><i>(vt)</i> <ul><li>uchikomu definition 3</li><li>uchikomu definition 4</li></ul></div>",
         "part-of-speech": "Godan verb",
         "pitch-accents": "<ol><li><span><span style=\"display:inline-block;position:relative;\">う<span style=\"\"></span></span><span style=\"display:inline-block;position:relative;\">ち<span style=\"display:block;user-select:none;pointer-events:none;position:absolute;top:0.1em;left:0;right:0;height:0;border-top:0.1em solid;\"></span></span><span style=\"display:inline-block;position:relative;\">こ<span style=\"display:block;user-select:none;pointer-events:none;position:absolute;top:0.1em;left:0;right:0;height:0;border-top:0.1em solid;\"></span></span><span style=\"display:inline-block;position:relative;\">む<span style=\"display:block;user-select:none;pointer-events:none;position:absolute;top:0.1em;left:0;right:0;height:0;border-top:0.1em solid;\"></span></span></span></li><li><span><span style=\"display:inline-block;position:relative;\">う<span style=\"\"></span></span><span style=\"display:inline-block;position:relative;\">ち<span style=\"display:block;user-select:none;pointer-events:none;position:absolute;top:0.1em;left:0;right:0;height:0;border-top:0.1em solid;\"></span></span><span style=\"display:inline-block;position:relative;padding-right:0.1em;margin-right:0.1em;\">こ<span style=\"display:block;user-select:none;pointer-events:none;position:absolute;top:0.1em;left:0;right:0;height:0;border-top:0.1em solid;right:-0.1em;height:0.4em;border-right:0.1em solid;\"></span></span><span style=\"display:inline-block;position:relative;\">む<span style=\"\"></span></span></span></li></ol>",
         "pitch-accent-graphs": "<ol><li><svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 250 100\" style=\"display:inline-block;height:2em;\">\n    <defs>\n        <g id=\"term-pitch-accent-graph-dot\"><circle cx=\"0\" cy=\"0\" r=\"15\" style=\"fill:#000;stroke:#000;stroke-width:5;\" /></g>\n        <g id=\"term-pitch-accent-graph-dot-downstep\"><circle cx=\"0\" cy=\"0\" r=\"15\" style=\"fill:none;stroke:#000;stroke-width:5;\" /><circle cx=\"0\" cy=\"0\" r=\"5\" style=\"fill:none;stroke:#000;stroke-width:5;\" /></g>\n        <g id=\"term-pitch-accent-graph-triangle\"><path d=\"M0 13 L15 -13 L-15 -13 Z\" style=\"fill:none;stroke:#000;stroke-width:5;\" /></g>\n    </defs>\n    <path style=\"fill:none;stroke:#000;stroke-width:5;\" d=\"M25 75L75 25L125 25L175 25\"></path>\n    <path style=\"fill:none;stroke:#000;stroke-width:5;stroke-dasharray:5 5;\" d=\"M175 25 L225 25\"></path>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"25\" y=\"75\"></use>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"75\" y=\"25\"></use>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"125\" y=\"25\"></use>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"175\" y=\"25\"></use>\n    <use href=\"#term-pitch-accent-graph-triangle\" x=\"225\" y=\"25\"></use>\n</svg></li><li><svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 250 100\" style=\"display:inline-block;height:2em;\">\n    <defs>\n        <g id=\"term-pitch-accent-graph-dot\"><circle cx=\"0\" cy=\"0\" r=\"15\" style=\"fill:#000;stroke:#000;stroke-width:5;\" /></g>\n        <g id=\"term-pitch-accent-graph-dot-downstep\"><circle cx=\"0\" cy=\"0\" r=\"15\" style=\"fill:none;stroke:#000;stroke-width:5;\" /><circle cx=\"0\" cy=\"0\" r=\"5\" style=\"fill:none;stroke:#000;stroke-width:5;\" /></g>\n        <g id=\"term-pitch-accent-graph-triangle\"><path d=\"M0 13 L15 -13 L-15 -13 Z\" style=\"fill:none;stroke:#000;stroke-width:5;\" /></g>\n    </defs>\n    <path style=\"fill:none;stroke:#000;stroke-width:5;\" d=\"M25 75L75 25L125 25L175 75\"></path>\n    <path style=\"fill:none;stroke:#000;stroke-width:5;stroke-dasharray:5 5;\" d=\"M175 75 L225 75\"></path>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"25\" y=\"75\"></use>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"75\" y=\"25\"></use>\n    <use href=\"#term-pitch-accent-graph-dot-downstep\" x=\"125\" y=\"25\"></use>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"175\" y=\"75\"></use>\n    <use href=\"#term-pitch-accent-graph-triangle\" x=\"225\" y=\"75\"></use>\n</svg></li></ol>",
@@ -1729,7 +1729,7 @@
         "screenshot": "<img src=\"\" />",
         "search-query": "fullQuery",
         "sentence": "cloze-prefix打(う)ち込(こ)むcloze-suffix",
-        "tags": "tag1, tag2",
+        "tags": "vt",
         "url": "<a href=\"url:\">url:</a>"
       },
       {
@@ -1746,9 +1746,9 @@
         "frequencies": "<ul style=\"text-align: left;\"><li>Test Dictionary 2: 3</li><li>Test Dictionary 2: 9</li></ul>",
         "furigana": "<ruby>打<rt>ぶ</rt></ruby>ち<ruby>込<rt>こ</rt></ruby>む",
         "furigana-plain": "打[ぶ]ち 込[こ]む",
-        "glossary": "<div style=\"text-align: left;\"><i>(tag1, tag2, Test Dictionary 2)</i> <ul><li>definition19</li><li>definition20</li></ul></div>",
-        "glossary-brief": "<div style=\"text-align: left;\"><ul><li>definition19</li><li>definition20</li></ul></div>",
-        "glossary-no-dictionary": "<div style=\"text-align: left;\"><i>(tag1, tag2)</i> <ul><li>definition19</li><li>definition20</li></ul></div>",
+        "glossary": "<div style=\"text-align: left;\"><i>(vt, Test Dictionary 2)</i> <ul><li>buchikomu definition 3</li><li>buchikomu definition 4</li></ul></div>",
+        "glossary-brief": "<div style=\"text-align: left;\"><ul><li>buchikomu definition 3</li><li>buchikomu definition 4</li></ul></div>",
+        "glossary-no-dictionary": "<div style=\"text-align: left;\"><i>(vt)</i> <ul><li>buchikomu definition 3</li><li>buchikomu definition 4</li></ul></div>",
         "part-of-speech": "Godan verb",
         "pitch-accents": "<ol><li><span><span style=\"display:inline-block;position:relative;\">ぶ<span style=\"\"></span></span><span style=\"display:inline-block;position:relative;\">ち<span style=\"display:block;user-select:none;pointer-events:none;position:absolute;top:0.1em;left:0;right:0;height:0;border-top:0.1em solid;\"></span></span><span style=\"display:inline-block;position:relative;\">こ<span style=\"display:block;user-select:none;pointer-events:none;position:absolute;top:0.1em;left:0;right:0;height:0;border-top:0.1em solid;\"></span></span><span style=\"display:inline-block;position:relative;\">む<span style=\"display:block;user-select:none;pointer-events:none;position:absolute;top:0.1em;left:0;right:0;height:0;border-top:0.1em solid;\"></span></span></span></li><li><span><span style=\"display:inline-block;position:relative;\">ぶ<span style=\"\"></span></span><span style=\"display:inline-block;position:relative;\">ち<span style=\"display:block;user-select:none;pointer-events:none;position:absolute;top:0.1em;left:0;right:0;height:0;border-top:0.1em solid;\"></span></span><span style=\"display:inline-block;position:relative;padding-right:0.1em;margin-right:0.1em;\">こ<span style=\"display:block;user-select:none;pointer-events:none;position:absolute;top:0.1em;left:0;right:0;height:0;border-top:0.1em solid;right:-0.1em;height:0.4em;border-right:0.1em solid;\"></span></span><span style=\"display:inline-block;position:relative;\">む<span style=\"\"></span></span></span></li></ol>",
         "pitch-accent-graphs": "<ol><li><svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 250 100\" style=\"display:inline-block;height:2em;\">\n    <defs>\n        <g id=\"term-pitch-accent-graph-dot\"><circle cx=\"0\" cy=\"0\" r=\"15\" style=\"fill:#000;stroke:#000;stroke-width:5;\" /></g>\n        <g id=\"term-pitch-accent-graph-dot-downstep\"><circle cx=\"0\" cy=\"0\" r=\"15\" style=\"fill:none;stroke:#000;stroke-width:5;\" /><circle cx=\"0\" cy=\"0\" r=\"5\" style=\"fill:none;stroke:#000;stroke-width:5;\" /></g>\n        <g id=\"term-pitch-accent-graph-triangle\"><path d=\"M0 13 L15 -13 L-15 -13 Z\" style=\"fill:none;stroke:#000;stroke-width:5;\" /></g>\n    </defs>\n    <path style=\"fill:none;stroke:#000;stroke-width:5;\" d=\"M25 75L75 25L125 25L175 25\"></path>\n    <path style=\"fill:none;stroke:#000;stroke-width:5;stroke-dasharray:5 5;\" d=\"M175 25 L225 25\"></path>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"25\" y=\"75\"></use>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"75\" y=\"25\"></use>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"125\" y=\"25\"></use>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"175\" y=\"25\"></use>\n    <use href=\"#term-pitch-accent-graph-triangle\" x=\"225\" y=\"25\"></use>\n</svg></li><li><svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 250 100\" style=\"display:inline-block;height:2em;\">\n    <defs>\n        <g id=\"term-pitch-accent-graph-dot\"><circle cx=\"0\" cy=\"0\" r=\"15\" style=\"fill:#000;stroke:#000;stroke-width:5;\" /></g>\n        <g id=\"term-pitch-accent-graph-dot-downstep\"><circle cx=\"0\" cy=\"0\" r=\"15\" style=\"fill:none;stroke:#000;stroke-width:5;\" /><circle cx=\"0\" cy=\"0\" r=\"5\" style=\"fill:none;stroke:#000;stroke-width:5;\" /></g>\n        <g id=\"term-pitch-accent-graph-triangle\"><path d=\"M0 13 L15 -13 L-15 -13 Z\" style=\"fill:none;stroke:#000;stroke-width:5;\" /></g>\n    </defs>\n    <path style=\"fill:none;stroke:#000;stroke-width:5;\" d=\"M25 75L75 25L125 25L175 75\"></path>\n    <path style=\"fill:none;stroke:#000;stroke-width:5;stroke-dasharray:5 5;\" d=\"M175 75 L225 75\"></path>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"25\" y=\"75\"></use>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"75\" y=\"25\"></use>\n    <use href=\"#term-pitch-accent-graph-dot-downstep\" x=\"125\" y=\"25\"></use>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"175\" y=\"75\"></use>\n    <use href=\"#term-pitch-accent-graph-triangle\" x=\"225\" y=\"75\"></use>\n</svg></li></ol>",
@@ -1757,7 +1757,7 @@
         "screenshot": "<img src=\"\" />",
         "search-query": "fullQuery",
         "sentence": "cloze-prefix打(う)ち込(こ)むcloze-suffix",
-        "tags": "tag1, tag2",
+        "tags": "vt",
         "url": "<a href=\"url:\">url:</a>"
       },
       {
@@ -1774,9 +1774,9 @@
         "frequencies": "<ul style=\"text-align: left;\"><li>Test Dictionary 2: 2</li><li>Test Dictionary 2: 6</li></ul>",
         "furigana": "<ruby>打<rt>う</rt></ruby>つ",
         "furigana-plain": "打[う]つ",
-        "glossary": "<div style=\"text-align: left;\"><i>(tag1, tag2, Test Dictionary 2)</i> <ul><li>definition5</li><li>definition6</li></ul></div>",
-        "glossary-brief": "<div style=\"text-align: left;\"><ul><li>definition5</li><li>definition6</li></ul></div>",
-        "glossary-no-dictionary": "<div style=\"text-align: left;\"><i>(tag1, tag2)</i> <ul><li>definition5</li><li>definition6</li></ul></div>",
+        "glossary": "<div style=\"text-align: left;\"><i>(vt, Test Dictionary 2)</i> <ul><li>utsu definition 1</li><li>utsu definition 2</li></ul></div>",
+        "glossary-brief": "<div style=\"text-align: left;\"><ul><li>utsu definition 1</li><li>utsu definition 2</li></ul></div>",
+        "glossary-no-dictionary": "<div style=\"text-align: left;\"><i>(vt)</i> <ul><li>utsu definition 1</li><li>utsu definition 2</li></ul></div>",
         "part-of-speech": "Godan verb",
         "pitch-accents": "No pitch accent data",
         "pitch-accent-graphs": "No pitch accent data",
@@ -1785,7 +1785,7 @@
         "screenshot": "<img src=\"\" />",
         "search-query": "fullQuery",
         "sentence": "cloze-prefix打(う)ちcloze-suffix",
-        "tags": "tag1, tag2",
+        "tags": "vt",
         "url": "<a href=\"url:\">url:</a>"
       },
       {
@@ -1802,9 +1802,9 @@
         "frequencies": "<ul style=\"text-align: left;\"><li>Test Dictionary 2: 2</li><li>Test Dictionary 2: 7</li></ul>",
         "furigana": "<ruby>打<rt>ぶ</rt></ruby>つ",
         "furigana-plain": "打[ぶ]つ",
-        "glossary": "<div style=\"text-align: left;\"><i>(tag1, tag2, Test Dictionary 2)</i> <ul><li>definition9</li><li>definition10</li></ul></div>",
-        "glossary-brief": "<div style=\"text-align: left;\"><ul><li>definition9</li><li>definition10</li></ul></div>",
-        "glossary-no-dictionary": "<div style=\"text-align: left;\"><i>(tag1, tag2)</i> <ul><li>definition9</li><li>definition10</li></ul></div>",
+        "glossary": "<div style=\"text-align: left;\"><i>(vt, Test Dictionary 2)</i> <ul><li>butsu definition 1</li><li>butsu definition 2</li></ul></div>",
+        "glossary-brief": "<div style=\"text-align: left;\"><ul><li>butsu definition 1</li><li>butsu definition 2</li></ul></div>",
+        "glossary-no-dictionary": "<div style=\"text-align: left;\"><i>(vt)</i> <ul><li>butsu definition 1</li><li>butsu definition 2</li></ul></div>",
         "part-of-speech": "Godan verb",
         "pitch-accents": "No pitch accent data",
         "pitch-accent-graphs": "No pitch accent data",
@@ -1813,7 +1813,7 @@
         "screenshot": "<img src=\"\" />",
         "search-query": "fullQuery",
         "sentence": "cloze-prefix打(う)ちcloze-suffix",
-        "tags": "tag1, tag2",
+        "tags": "vt",
         "url": "<a href=\"url:\">url:</a>"
       },
       {
@@ -1830,9 +1830,9 @@
         "frequencies": "<ul style=\"text-align: left;\"><li>Test Dictionary 2: 2</li><li>Test Dictionary 2: 6</li></ul>",
         "furigana": "<ruby>打<rt>う</rt></ruby>つ",
         "furigana-plain": "打[う]つ",
-        "glossary": "<div style=\"text-align: left;\"><i>(tag1, tag2, Test Dictionary 2)</i> <ul><li>definition7</li><li>definition8</li></ul></div>",
-        "glossary-brief": "<div style=\"text-align: left;\"><ul><li>definition7</li><li>definition8</li></ul></div>",
-        "glossary-no-dictionary": "<div style=\"text-align: left;\"><i>(tag1, tag2)</i> <ul><li>definition7</li><li>definition8</li></ul></div>",
+        "glossary": "<div style=\"text-align: left;\"><i>(vt, Test Dictionary 2)</i> <ul><li>utsu definition 3</li><li>utsu definition 4</li></ul></div>",
+        "glossary-brief": "<div style=\"text-align: left;\"><ul><li>utsu definition 3</li><li>utsu definition 4</li></ul></div>",
+        "glossary-no-dictionary": "<div style=\"text-align: left;\"><i>(vt)</i> <ul><li>utsu definition 3</li><li>utsu definition 4</li></ul></div>",
         "part-of-speech": "Godan verb",
         "pitch-accents": "No pitch accent data",
         "pitch-accent-graphs": "No pitch accent data",
@@ -1841,7 +1841,7 @@
         "screenshot": "<img src=\"\" />",
         "search-query": "fullQuery",
         "sentence": "cloze-prefix打(う)ちcloze-suffix",
-        "tags": "tag1, tag2",
+        "tags": "vt",
         "url": "<a href=\"url:\">url:</a>"
       },
       {
@@ -1858,9 +1858,9 @@
         "frequencies": "<ul style=\"text-align: left;\"><li>Test Dictionary 2: 2</li><li>Test Dictionary 2: 7</li></ul>",
         "furigana": "<ruby>打<rt>ぶ</rt></ruby>つ",
         "furigana-plain": "打[ぶ]つ",
-        "glossary": "<div style=\"text-align: left;\"><i>(tag1, tag2, Test Dictionary 2)</i> <ul><li>definition11</li><li>definition12</li></ul></div>",
-        "glossary-brief": "<div style=\"text-align: left;\"><ul><li>definition11</li><li>definition12</li></ul></div>",
-        "glossary-no-dictionary": "<div style=\"text-align: left;\"><i>(tag1, tag2)</i> <ul><li>definition11</li><li>definition12</li></ul></div>",
+        "glossary": "<div style=\"text-align: left;\"><i>(vt, Test Dictionary 2)</i> <ul><li>butsu definition 3</li><li>butsu definition 4</li></ul></div>",
+        "glossary-brief": "<div style=\"text-align: left;\"><ul><li>butsu definition 3</li><li>butsu definition 4</li></ul></div>",
+        "glossary-no-dictionary": "<div style=\"text-align: left;\"><i>(vt)</i> <ul><li>butsu definition 3</li><li>butsu definition 4</li></ul></div>",
         "part-of-speech": "Godan verb",
         "pitch-accents": "No pitch accent data",
         "pitch-accent-graphs": "No pitch accent data",
@@ -1869,7 +1869,7 @@
         "screenshot": "<img src=\"\" />",
         "search-query": "fullQuery",
         "sentence": "cloze-prefix打(う)ちcloze-suffix",
-        "tags": "tag1, tag2",
+        "tags": "vt",
         "url": "<a href=\"url:\">url:</a>"
       },
       {
@@ -1886,10 +1886,10 @@
         "frequencies": "<ul style=\"text-align: left;\"><li>Test Dictionary 2: 1</li><li>Test Dictionary 2: 4</li></ul>",
         "furigana": "<ruby>打<rt>だ</rt></ruby>",
         "furigana-plain": "打[だ]",
-        "glossary": "<div style=\"text-align: left;\"><i>(tag1, tag2, Test Dictionary 2)</i> <ul><li>definition1</li><li>definition2</li></ul></div>",
-        "glossary-brief": "<div style=\"text-align: left;\"><ul><li>definition1</li><li>definition2</li></ul></div>",
-        "glossary-no-dictionary": "<div style=\"text-align: left;\"><i>(tag1, tag2)</i> <ul><li>definition1</li><li>definition2</li></ul></div>",
-        "part-of-speech": "Unknown",
+        "glossary": "<div style=\"text-align: left;\"><i>(n, Test Dictionary 2)</i> <ul><li>da definition 1</li><li>da definition 2</li></ul></div>",
+        "glossary-brief": "<div style=\"text-align: left;\"><ul><li>da definition 1</li><li>da definition 2</li></ul></div>",
+        "glossary-no-dictionary": "<div style=\"text-align: left;\"><i>(n)</i> <ul><li>da definition 1</li><li>da definition 2</li></ul></div>",
+        "part-of-speech": "Noun",
         "pitch-accents": "No pitch accent data",
         "pitch-accent-graphs": "No pitch accent data",
         "pitch-accent-positions": "No pitch accent data",
@@ -1897,7 +1897,7 @@
         "screenshot": "<img src=\"\" />",
         "search-query": "fullQuery",
         "sentence": "cloze-prefix打cloze-suffix",
-        "tags": "tag1, tag2",
+        "tags": "n",
         "url": "<a href=\"url:\">url:</a>"
       },
       {
@@ -1914,10 +1914,10 @@
         "frequencies": "<ul style=\"text-align: left;\"><li>Test Dictionary 2: 1</li><li>Test Dictionary 2: 5</li></ul>",
         "furigana": "<ruby>打<rt>ダース</rt></ruby>",
         "furigana-plain": "打[ダース]",
-        "glossary": "<div style=\"text-align: left;\"><i>(tag1, tag2, Test Dictionary 2)</i> <ul><li>definition3</li><li>definition4</li></ul></div>",
-        "glossary-brief": "<div style=\"text-align: left;\"><ul><li>definition3</li><li>definition4</li></ul></div>",
-        "glossary-no-dictionary": "<div style=\"text-align: left;\"><i>(tag1, tag2)</i> <ul><li>definition3</li><li>definition4</li></ul></div>",
-        "part-of-speech": "Unknown",
+        "glossary": "<div style=\"text-align: left;\"><i>(abbr, n, Test Dictionary 2)</i> <ul><li>daasu definition 1</li><li>daasu definition 2</li></ul></div>",
+        "glossary-brief": "<div style=\"text-align: left;\"><ul><li>daasu definition 1</li><li>daasu definition 2</li></ul></div>",
+        "glossary-no-dictionary": "<div style=\"text-align: left;\"><i>(abbr, n)</i> <ul><li>daasu definition 1</li><li>daasu definition 2</li></ul></div>",
+        "part-of-speech": "Noun",
         "pitch-accents": "No pitch accent data",
         "pitch-accent-graphs": "No pitch accent data",
         "pitch-accent-positions": "No pitch accent data",
@@ -1925,7 +1925,7 @@
         "screenshot": "<img src=\"\" />",
         "search-query": "fullQuery",
         "sentence": "cloze-prefix打cloze-suffix",
-        "tags": "tag1, tag2",
+        "tags": "abbr, n",
         "url": "<a href=\"url:\">url:</a>"
       }
     ]
@@ -1947,9 +1947,9 @@
         "frequencies": "<ul style=\"text-align: left;\"><li>Test Dictionary 2: 3</li><li>Test Dictionary 2: 8</li></ul>",
         "furigana": "<ruby>打<rt>う</rt></ruby>ち<ruby>込<rt>こ</rt></ruby>む",
         "furigana-plain": "打[う]ち 込[こ]む",
-        "glossary": "<div style=\"text-align: left;\"><i>(tag1, tag2, Test Dictionary 2)</i> <ul><li>definition13</li><li>definition14</li></ul></div>",
-        "glossary-brief": "<div style=\"text-align: left;\"><ul><li>definition13</li><li>definition14</li></ul></div>",
-        "glossary-no-dictionary": "<div style=\"text-align: left;\"><i>(tag1, tag2)</i> <ul><li>definition13</li><li>definition14</li></ul></div>",
+        "glossary": "<div style=\"text-align: left;\"><i>(vt, Test Dictionary 2)</i> <ul><li>uchikomu definition 1</li><li>uchikomu definition 2</li></ul></div>",
+        "glossary-brief": "<div style=\"text-align: left;\"><ul><li>uchikomu definition 1</li><li>uchikomu definition 2</li></ul></div>",
+        "glossary-no-dictionary": "<div style=\"text-align: left;\"><i>(vt)</i> <ul><li>uchikomu definition 1</li><li>uchikomu definition 2</li></ul></div>",
         "part-of-speech": "Godan verb",
         "pitch-accents": "<ol><li><span><span style=\"display:inline-block;position:relative;\">う<span style=\"\"></span></span><span style=\"display:inline-block;position:relative;\">ち<span style=\"display:block;user-select:none;pointer-events:none;position:absolute;top:0.1em;left:0;right:0;height:0;border-top:0.1em solid;\"></span></span><span style=\"display:inline-block;position:relative;\">こ<span style=\"display:block;user-select:none;pointer-events:none;position:absolute;top:0.1em;left:0;right:0;height:0;border-top:0.1em solid;\"></span></span><span style=\"display:inline-block;position:relative;\">む<span style=\"display:block;user-select:none;pointer-events:none;position:absolute;top:0.1em;left:0;right:0;height:0;border-top:0.1em solid;\"></span></span></span></li><li><span><span style=\"display:inline-block;position:relative;\">う<span style=\"\"></span></span><span style=\"display:inline-block;position:relative;\">ち<span style=\"display:block;user-select:none;pointer-events:none;position:absolute;top:0.1em;left:0;right:0;height:0;border-top:0.1em solid;\"></span></span><span style=\"display:inline-block;position:relative;padding-right:0.1em;margin-right:0.1em;\">こ<span style=\"display:block;user-select:none;pointer-events:none;position:absolute;top:0.1em;left:0;right:0;height:0;border-top:0.1em solid;right:-0.1em;height:0.4em;border-right:0.1em solid;\"></span></span><span style=\"display:inline-block;position:relative;\">む<span style=\"\"></span></span></span></li></ol>",
         "pitch-accent-graphs": "<ol><li><svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 250 100\" style=\"display:inline-block;height:2em;\">\n    <defs>\n        <g id=\"term-pitch-accent-graph-dot\"><circle cx=\"0\" cy=\"0\" r=\"15\" style=\"fill:#000;stroke:#000;stroke-width:5;\" /></g>\n        <g id=\"term-pitch-accent-graph-dot-downstep\"><circle cx=\"0\" cy=\"0\" r=\"15\" style=\"fill:none;stroke:#000;stroke-width:5;\" /><circle cx=\"0\" cy=\"0\" r=\"5\" style=\"fill:none;stroke:#000;stroke-width:5;\" /></g>\n        <g id=\"term-pitch-accent-graph-triangle\"><path d=\"M0 13 L15 -13 L-15 -13 Z\" style=\"fill:none;stroke:#000;stroke-width:5;\" /></g>\n    </defs>\n    <path style=\"fill:none;stroke:#000;stroke-width:5;\" d=\"M25 75L75 25L125 25L175 25\"></path>\n    <path style=\"fill:none;stroke:#000;stroke-width:5;stroke-dasharray:5 5;\" d=\"M175 25 L225 25\"></path>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"25\" y=\"75\"></use>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"75\" y=\"25\"></use>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"125\" y=\"25\"></use>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"175\" y=\"25\"></use>\n    <use href=\"#term-pitch-accent-graph-triangle\" x=\"225\" y=\"25\"></use>\n</svg></li><li><svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 250 100\" style=\"display:inline-block;height:2em;\">\n    <defs>\n        <g id=\"term-pitch-accent-graph-dot\"><circle cx=\"0\" cy=\"0\" r=\"15\" style=\"fill:#000;stroke:#000;stroke-width:5;\" /></g>\n        <g id=\"term-pitch-accent-graph-dot-downstep\"><circle cx=\"0\" cy=\"0\" r=\"15\" style=\"fill:none;stroke:#000;stroke-width:5;\" /><circle cx=\"0\" cy=\"0\" r=\"5\" style=\"fill:none;stroke:#000;stroke-width:5;\" /></g>\n        <g id=\"term-pitch-accent-graph-triangle\"><path d=\"M0 13 L15 -13 L-15 -13 Z\" style=\"fill:none;stroke:#000;stroke-width:5;\" /></g>\n    </defs>\n    <path style=\"fill:none;stroke:#000;stroke-width:5;\" d=\"M25 75L75 25L125 25L175 75\"></path>\n    <path style=\"fill:none;stroke:#000;stroke-width:5;stroke-dasharray:5 5;\" d=\"M175 75 L225 75\"></path>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"25\" y=\"75\"></use>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"75\" y=\"25\"></use>\n    <use href=\"#term-pitch-accent-graph-dot-downstep\" x=\"125\" y=\"25\"></use>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"175\" y=\"75\"></use>\n    <use href=\"#term-pitch-accent-graph-triangle\" x=\"225\" y=\"75\"></use>\n</svg></li></ol>",
@@ -1958,7 +1958,7 @@
         "screenshot": "<img src=\"\" />",
         "search-query": "fullQuery",
         "sentence": "cloze-prefix(打)(ち)(込)(む)cloze-suffix",
-        "tags": "tag1, tag2",
+        "tags": "vt",
         "url": "<a href=\"url:\">url:</a>"
       },
       {
@@ -1975,9 +1975,9 @@
         "frequencies": "<ul style=\"text-align: left;\"><li>Test Dictionary 2: 3</li><li>Test Dictionary 2: 9</li></ul>",
         "furigana": "<ruby>打<rt>ぶ</rt></ruby>ち<ruby>込<rt>こ</rt></ruby>む",
         "furigana-plain": "打[ぶ]ち 込[こ]む",
-        "glossary": "<div style=\"text-align: left;\"><i>(tag1, tag2, Test Dictionary 2)</i> <ul><li>definition17</li><li>definition18</li></ul></div>",
-        "glossary-brief": "<div style=\"text-align: left;\"><ul><li>definition17</li><li>definition18</li></ul></div>",
-        "glossary-no-dictionary": "<div style=\"text-align: left;\"><i>(tag1, tag2)</i> <ul><li>definition17</li><li>definition18</li></ul></div>",
+        "glossary": "<div style=\"text-align: left;\"><i>(vt, Test Dictionary 2)</i> <ul><li>buchikomu definition 1</li><li>buchikomu definition 2</li></ul></div>",
+        "glossary-brief": "<div style=\"text-align: left;\"><ul><li>buchikomu definition 1</li><li>buchikomu definition 2</li></ul></div>",
+        "glossary-no-dictionary": "<div style=\"text-align: left;\"><i>(vt)</i> <ul><li>buchikomu definition 1</li><li>buchikomu definition 2</li></ul></div>",
         "part-of-speech": "Godan verb",
         "pitch-accents": "<ol><li><span><span style=\"display:inline-block;position:relative;\">ぶ<span style=\"\"></span></span><span style=\"display:inline-block;position:relative;\">ち<span style=\"display:block;user-select:none;pointer-events:none;position:absolute;top:0.1em;left:0;right:0;height:0;border-top:0.1em solid;\"></span></span><span style=\"display:inline-block;position:relative;\">こ<span style=\"display:block;user-select:none;pointer-events:none;position:absolute;top:0.1em;left:0;right:0;height:0;border-top:0.1em solid;\"></span></span><span style=\"display:inline-block;position:relative;\">む<span style=\"display:block;user-select:none;pointer-events:none;position:absolute;top:0.1em;left:0;right:0;height:0;border-top:0.1em solid;\"></span></span></span></li><li><span><span style=\"display:inline-block;position:relative;\">ぶ<span style=\"\"></span></span><span style=\"display:inline-block;position:relative;\">ち<span style=\"display:block;user-select:none;pointer-events:none;position:absolute;top:0.1em;left:0;right:0;height:0;border-top:0.1em solid;\"></span></span><span style=\"display:inline-block;position:relative;padding-right:0.1em;margin-right:0.1em;\">こ<span style=\"display:block;user-select:none;pointer-events:none;position:absolute;top:0.1em;left:0;right:0;height:0;border-top:0.1em solid;right:-0.1em;height:0.4em;border-right:0.1em solid;\"></span></span><span style=\"display:inline-block;position:relative;\">む<span style=\"\"></span></span></span></li></ol>",
         "pitch-accent-graphs": "<ol><li><svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 250 100\" style=\"display:inline-block;height:2em;\">\n    <defs>\n        <g id=\"term-pitch-accent-graph-dot\"><circle cx=\"0\" cy=\"0\" r=\"15\" style=\"fill:#000;stroke:#000;stroke-width:5;\" /></g>\n        <g id=\"term-pitch-accent-graph-dot-downstep\"><circle cx=\"0\" cy=\"0\" r=\"15\" style=\"fill:none;stroke:#000;stroke-width:5;\" /><circle cx=\"0\" cy=\"0\" r=\"5\" style=\"fill:none;stroke:#000;stroke-width:5;\" /></g>\n        <g id=\"term-pitch-accent-graph-triangle\"><path d=\"M0 13 L15 -13 L-15 -13 Z\" style=\"fill:none;stroke:#000;stroke-width:5;\" /></g>\n    </defs>\n    <path style=\"fill:none;stroke:#000;stroke-width:5;\" d=\"M25 75L75 25L125 25L175 25\"></path>\n    <path style=\"fill:none;stroke:#000;stroke-width:5;stroke-dasharray:5 5;\" d=\"M175 25 L225 25\"></path>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"25\" y=\"75\"></use>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"75\" y=\"25\"></use>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"125\" y=\"25\"></use>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"175\" y=\"25\"></use>\n    <use href=\"#term-pitch-accent-graph-triangle\" x=\"225\" y=\"25\"></use>\n</svg></li><li><svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 250 100\" style=\"display:inline-block;height:2em;\">\n    <defs>\n        <g id=\"term-pitch-accent-graph-dot\"><circle cx=\"0\" cy=\"0\" r=\"15\" style=\"fill:#000;stroke:#000;stroke-width:5;\" /></g>\n        <g id=\"term-pitch-accent-graph-dot-downstep\"><circle cx=\"0\" cy=\"0\" r=\"15\" style=\"fill:none;stroke:#000;stroke-width:5;\" /><circle cx=\"0\" cy=\"0\" r=\"5\" style=\"fill:none;stroke:#000;stroke-width:5;\" /></g>\n        <g id=\"term-pitch-accent-graph-triangle\"><path d=\"M0 13 L15 -13 L-15 -13 Z\" style=\"fill:none;stroke:#000;stroke-width:5;\" /></g>\n    </defs>\n    <path style=\"fill:none;stroke:#000;stroke-width:5;\" d=\"M25 75L75 25L125 25L175 75\"></path>\n    <path style=\"fill:none;stroke:#000;stroke-width:5;stroke-dasharray:5 5;\" d=\"M175 75 L225 75\"></path>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"25\" y=\"75\"></use>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"75\" y=\"25\"></use>\n    <use href=\"#term-pitch-accent-graph-dot-downstep\" x=\"125\" y=\"25\"></use>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"175\" y=\"75\"></use>\n    <use href=\"#term-pitch-accent-graph-triangle\" x=\"225\" y=\"75\"></use>\n</svg></li></ol>",
@@ -1986,7 +1986,7 @@
         "screenshot": "<img src=\"\" />",
         "search-query": "fullQuery",
         "sentence": "cloze-prefix(打)(ち)(込)(む)cloze-suffix",
-        "tags": "tag1, tag2",
+        "tags": "vt",
         "url": "<a href=\"url:\">url:</a>"
       },
       {
@@ -2003,9 +2003,9 @@
         "frequencies": "<ul style=\"text-align: left;\"><li>Test Dictionary 2: 3</li><li>Test Dictionary 2: 8</li></ul>",
         "furigana": "<ruby>打<rt>う</rt></ruby>ち<ruby>込<rt>こ</rt></ruby>む",
         "furigana-plain": "打[う]ち 込[こ]む",
-        "glossary": "<div style=\"text-align: left;\"><i>(tag1, tag2, Test Dictionary 2)</i> <ul><li>definition15</li><li>definition16</li></ul></div>",
-        "glossary-brief": "<div style=\"text-align: left;\"><ul><li>definition15</li><li>definition16</li></ul></div>",
-        "glossary-no-dictionary": "<div style=\"text-align: left;\"><i>(tag1, tag2)</i> <ul><li>definition15</li><li>definition16</li></ul></div>",
+        "glossary": "<div style=\"text-align: left;\"><i>(vt, Test Dictionary 2)</i> <ul><li>uchikomu definition 3</li><li>uchikomu definition 4</li></ul></div>",
+        "glossary-brief": "<div style=\"text-align: left;\"><ul><li>uchikomu definition 3</li><li>uchikomu definition 4</li></ul></div>",
+        "glossary-no-dictionary": "<div style=\"text-align: left;\"><i>(vt)</i> <ul><li>uchikomu definition 3</li><li>uchikomu definition 4</li></ul></div>",
         "part-of-speech": "Godan verb",
         "pitch-accents": "<ol><li><span><span style=\"display:inline-block;position:relative;\">う<span style=\"\"></span></span><span style=\"display:inline-block;position:relative;\">ち<span style=\"display:block;user-select:none;pointer-events:none;position:absolute;top:0.1em;left:0;right:0;height:0;border-top:0.1em solid;\"></span></span><span style=\"display:inline-block;position:relative;\">こ<span style=\"display:block;user-select:none;pointer-events:none;position:absolute;top:0.1em;left:0;right:0;height:0;border-top:0.1em solid;\"></span></span><span style=\"display:inline-block;position:relative;\">む<span style=\"display:block;user-select:none;pointer-events:none;position:absolute;top:0.1em;left:0;right:0;height:0;border-top:0.1em solid;\"></span></span></span></li><li><span><span style=\"display:inline-block;position:relative;\">う<span style=\"\"></span></span><span style=\"display:inline-block;position:relative;\">ち<span style=\"display:block;user-select:none;pointer-events:none;position:absolute;top:0.1em;left:0;right:0;height:0;border-top:0.1em solid;\"></span></span><span style=\"display:inline-block;position:relative;padding-right:0.1em;margin-right:0.1em;\">こ<span style=\"display:block;user-select:none;pointer-events:none;position:absolute;top:0.1em;left:0;right:0;height:0;border-top:0.1em solid;right:-0.1em;height:0.4em;border-right:0.1em solid;\"></span></span><span style=\"display:inline-block;position:relative;\">む<span style=\"\"></span></span></span></li></ol>",
         "pitch-accent-graphs": "<ol><li><svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 250 100\" style=\"display:inline-block;height:2em;\">\n    <defs>\n        <g id=\"term-pitch-accent-graph-dot\"><circle cx=\"0\" cy=\"0\" r=\"15\" style=\"fill:#000;stroke:#000;stroke-width:5;\" /></g>\n        <g id=\"term-pitch-accent-graph-dot-downstep\"><circle cx=\"0\" cy=\"0\" r=\"15\" style=\"fill:none;stroke:#000;stroke-width:5;\" /><circle cx=\"0\" cy=\"0\" r=\"5\" style=\"fill:none;stroke:#000;stroke-width:5;\" /></g>\n        <g id=\"term-pitch-accent-graph-triangle\"><path d=\"M0 13 L15 -13 L-15 -13 Z\" style=\"fill:none;stroke:#000;stroke-width:5;\" /></g>\n    </defs>\n    <path style=\"fill:none;stroke:#000;stroke-width:5;\" d=\"M25 75L75 25L125 25L175 25\"></path>\n    <path style=\"fill:none;stroke:#000;stroke-width:5;stroke-dasharray:5 5;\" d=\"M175 25 L225 25\"></path>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"25\" y=\"75\"></use>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"75\" y=\"25\"></use>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"125\" y=\"25\"></use>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"175\" y=\"25\"></use>\n    <use href=\"#term-pitch-accent-graph-triangle\" x=\"225\" y=\"25\"></use>\n</svg></li><li><svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 250 100\" style=\"display:inline-block;height:2em;\">\n    <defs>\n        <g id=\"term-pitch-accent-graph-dot\"><circle cx=\"0\" cy=\"0\" r=\"15\" style=\"fill:#000;stroke:#000;stroke-width:5;\" /></g>\n        <g id=\"term-pitch-accent-graph-dot-downstep\"><circle cx=\"0\" cy=\"0\" r=\"15\" style=\"fill:none;stroke:#000;stroke-width:5;\" /><circle cx=\"0\" cy=\"0\" r=\"5\" style=\"fill:none;stroke:#000;stroke-width:5;\" /></g>\n        <g id=\"term-pitch-accent-graph-triangle\"><path d=\"M0 13 L15 -13 L-15 -13 Z\" style=\"fill:none;stroke:#000;stroke-width:5;\" /></g>\n    </defs>\n    <path style=\"fill:none;stroke:#000;stroke-width:5;\" d=\"M25 75L75 25L125 25L175 75\"></path>\n    <path style=\"fill:none;stroke:#000;stroke-width:5;stroke-dasharray:5 5;\" d=\"M175 75 L225 75\"></path>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"25\" y=\"75\"></use>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"75\" y=\"25\"></use>\n    <use href=\"#term-pitch-accent-graph-dot-downstep\" x=\"125\" y=\"25\"></use>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"175\" y=\"75\"></use>\n    <use href=\"#term-pitch-accent-graph-triangle\" x=\"225\" y=\"75\"></use>\n</svg></li></ol>",
@@ -2014,7 +2014,7 @@
         "screenshot": "<img src=\"\" />",
         "search-query": "fullQuery",
         "sentence": "cloze-prefix(打)(ち)(込)(む)cloze-suffix",
-        "tags": "tag1, tag2",
+        "tags": "vt",
         "url": "<a href=\"url:\">url:</a>"
       },
       {
@@ -2031,9 +2031,9 @@
         "frequencies": "<ul style=\"text-align: left;\"><li>Test Dictionary 2: 3</li><li>Test Dictionary 2: 9</li></ul>",
         "furigana": "<ruby>打<rt>ぶ</rt></ruby>ち<ruby>込<rt>こ</rt></ruby>む",
         "furigana-plain": "打[ぶ]ち 込[こ]む",
-        "glossary": "<div style=\"text-align: left;\"><i>(tag1, tag2, Test Dictionary 2)</i> <ul><li>definition19</li><li>definition20</li></ul></div>",
-        "glossary-brief": "<div style=\"text-align: left;\"><ul><li>definition19</li><li>definition20</li></ul></div>",
-        "glossary-no-dictionary": "<div style=\"text-align: left;\"><i>(tag1, tag2)</i> <ul><li>definition19</li><li>definition20</li></ul></div>",
+        "glossary": "<div style=\"text-align: left;\"><i>(vt, Test Dictionary 2)</i> <ul><li>buchikomu definition 3</li><li>buchikomu definition 4</li></ul></div>",
+        "glossary-brief": "<div style=\"text-align: left;\"><ul><li>buchikomu definition 3</li><li>buchikomu definition 4</li></ul></div>",
+        "glossary-no-dictionary": "<div style=\"text-align: left;\"><i>(vt)</i> <ul><li>buchikomu definition 3</li><li>buchikomu definition 4</li></ul></div>",
         "part-of-speech": "Godan verb",
         "pitch-accents": "<ol><li><span><span style=\"display:inline-block;position:relative;\">ぶ<span style=\"\"></span></span><span style=\"display:inline-block;position:relative;\">ち<span style=\"display:block;user-select:none;pointer-events:none;position:absolute;top:0.1em;left:0;right:0;height:0;border-top:0.1em solid;\"></span></span><span style=\"display:inline-block;position:relative;\">こ<span style=\"display:block;user-select:none;pointer-events:none;position:absolute;top:0.1em;left:0;right:0;height:0;border-top:0.1em solid;\"></span></span><span style=\"display:inline-block;position:relative;\">む<span style=\"display:block;user-select:none;pointer-events:none;position:absolute;top:0.1em;left:0;right:0;height:0;border-top:0.1em solid;\"></span></span></span></li><li><span><span style=\"display:inline-block;position:relative;\">ぶ<span style=\"\"></span></span><span style=\"display:inline-block;position:relative;\">ち<span style=\"display:block;user-select:none;pointer-events:none;position:absolute;top:0.1em;left:0;right:0;height:0;border-top:0.1em solid;\"></span></span><span style=\"display:inline-block;position:relative;padding-right:0.1em;margin-right:0.1em;\">こ<span style=\"display:block;user-select:none;pointer-events:none;position:absolute;top:0.1em;left:0;right:0;height:0;border-top:0.1em solid;right:-0.1em;height:0.4em;border-right:0.1em solid;\"></span></span><span style=\"display:inline-block;position:relative;\">む<span style=\"\"></span></span></span></li></ol>",
         "pitch-accent-graphs": "<ol><li><svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 250 100\" style=\"display:inline-block;height:2em;\">\n    <defs>\n        <g id=\"term-pitch-accent-graph-dot\"><circle cx=\"0\" cy=\"0\" r=\"15\" style=\"fill:#000;stroke:#000;stroke-width:5;\" /></g>\n        <g id=\"term-pitch-accent-graph-dot-downstep\"><circle cx=\"0\" cy=\"0\" r=\"15\" style=\"fill:none;stroke:#000;stroke-width:5;\" /><circle cx=\"0\" cy=\"0\" r=\"5\" style=\"fill:none;stroke:#000;stroke-width:5;\" /></g>\n        <g id=\"term-pitch-accent-graph-triangle\"><path d=\"M0 13 L15 -13 L-15 -13 Z\" style=\"fill:none;stroke:#000;stroke-width:5;\" /></g>\n    </defs>\n    <path style=\"fill:none;stroke:#000;stroke-width:5;\" d=\"M25 75L75 25L125 25L175 25\"></path>\n    <path style=\"fill:none;stroke:#000;stroke-width:5;stroke-dasharray:5 5;\" d=\"M175 25 L225 25\"></path>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"25\" y=\"75\"></use>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"75\" y=\"25\"></use>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"125\" y=\"25\"></use>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"175\" y=\"25\"></use>\n    <use href=\"#term-pitch-accent-graph-triangle\" x=\"225\" y=\"25\"></use>\n</svg></li><li><svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 250 100\" style=\"display:inline-block;height:2em;\">\n    <defs>\n        <g id=\"term-pitch-accent-graph-dot\"><circle cx=\"0\" cy=\"0\" r=\"15\" style=\"fill:#000;stroke:#000;stroke-width:5;\" /></g>\n        <g id=\"term-pitch-accent-graph-dot-downstep\"><circle cx=\"0\" cy=\"0\" r=\"15\" style=\"fill:none;stroke:#000;stroke-width:5;\" /><circle cx=\"0\" cy=\"0\" r=\"5\" style=\"fill:none;stroke:#000;stroke-width:5;\" /></g>\n        <g id=\"term-pitch-accent-graph-triangle\"><path d=\"M0 13 L15 -13 L-15 -13 Z\" style=\"fill:none;stroke:#000;stroke-width:5;\" /></g>\n    </defs>\n    <path style=\"fill:none;stroke:#000;stroke-width:5;\" d=\"M25 75L75 25L125 25L175 75\"></path>\n    <path style=\"fill:none;stroke:#000;stroke-width:5;stroke-dasharray:5 5;\" d=\"M175 75 L225 75\"></path>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"25\" y=\"75\"></use>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"75\" y=\"25\"></use>\n    <use href=\"#term-pitch-accent-graph-dot-downstep\" x=\"125\" y=\"25\"></use>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"175\" y=\"75\"></use>\n    <use href=\"#term-pitch-accent-graph-triangle\" x=\"225\" y=\"75\"></use>\n</svg></li></ol>",
@@ -2042,7 +2042,7 @@
         "screenshot": "<img src=\"\" />",
         "search-query": "fullQuery",
         "sentence": "cloze-prefix(打)(ち)(込)(む)cloze-suffix",
-        "tags": "tag1, tag2",
+        "tags": "vt",
         "url": "<a href=\"url:\">url:</a>"
       },
       {
@@ -2059,9 +2059,9 @@
         "frequencies": "<ul style=\"text-align: left;\"><li>Test Dictionary 2: 2</li><li>Test Dictionary 2: 6</li></ul>",
         "furigana": "<ruby>打<rt>う</rt></ruby>つ",
         "furigana-plain": "打[う]つ",
-        "glossary": "<div style=\"text-align: left;\"><i>(tag1, tag2, Test Dictionary 2)</i> <ul><li>definition5</li><li>definition6</li></ul></div>",
-        "glossary-brief": "<div style=\"text-align: left;\"><ul><li>definition5</li><li>definition6</li></ul></div>",
-        "glossary-no-dictionary": "<div style=\"text-align: left;\"><i>(tag1, tag2)</i> <ul><li>definition5</li><li>definition6</li></ul></div>",
+        "glossary": "<div style=\"text-align: left;\"><i>(vt, Test Dictionary 2)</i> <ul><li>utsu definition 1</li><li>utsu definition 2</li></ul></div>",
+        "glossary-brief": "<div style=\"text-align: left;\"><ul><li>utsu definition 1</li><li>utsu definition 2</li></ul></div>",
+        "glossary-no-dictionary": "<div style=\"text-align: left;\"><i>(vt)</i> <ul><li>utsu definition 1</li><li>utsu definition 2</li></ul></div>",
         "part-of-speech": "Godan verb",
         "pitch-accents": "No pitch accent data",
         "pitch-accent-graphs": "No pitch accent data",
@@ -2070,7 +2070,7 @@
         "screenshot": "<img src=\"\" />",
         "search-query": "fullQuery",
         "sentence": "cloze-prefix(打)(ち)cloze-suffix",
-        "tags": "tag1, tag2",
+        "tags": "vt",
         "url": "<a href=\"url:\">url:</a>"
       },
       {
@@ -2087,9 +2087,9 @@
         "frequencies": "<ul style=\"text-align: left;\"><li>Test Dictionary 2: 2</li><li>Test Dictionary 2: 7</li></ul>",
         "furigana": "<ruby>打<rt>ぶ</rt></ruby>つ",
         "furigana-plain": "打[ぶ]つ",
-        "glossary": "<div style=\"text-align: left;\"><i>(tag1, tag2, Test Dictionary 2)</i> <ul><li>definition9</li><li>definition10</li></ul></div>",
-        "glossary-brief": "<div style=\"text-align: left;\"><ul><li>definition9</li><li>definition10</li></ul></div>",
-        "glossary-no-dictionary": "<div style=\"text-align: left;\"><i>(tag1, tag2)</i> <ul><li>definition9</li><li>definition10</li></ul></div>",
+        "glossary": "<div style=\"text-align: left;\"><i>(vt, Test Dictionary 2)</i> <ul><li>butsu definition 1</li><li>butsu definition 2</li></ul></div>",
+        "glossary-brief": "<div style=\"text-align: left;\"><ul><li>butsu definition 1</li><li>butsu definition 2</li></ul></div>",
+        "glossary-no-dictionary": "<div style=\"text-align: left;\"><i>(vt)</i> <ul><li>butsu definition 1</li><li>butsu definition 2</li></ul></div>",
         "part-of-speech": "Godan verb",
         "pitch-accents": "No pitch accent data",
         "pitch-accent-graphs": "No pitch accent data",
@@ -2098,7 +2098,7 @@
         "screenshot": "<img src=\"\" />",
         "search-query": "fullQuery",
         "sentence": "cloze-prefix(打)(ち)cloze-suffix",
-        "tags": "tag1, tag2",
+        "tags": "vt",
         "url": "<a href=\"url:\">url:</a>"
       },
       {
@@ -2115,9 +2115,9 @@
         "frequencies": "<ul style=\"text-align: left;\"><li>Test Dictionary 2: 2</li><li>Test Dictionary 2: 6</li></ul>",
         "furigana": "<ruby>打<rt>う</rt></ruby>つ",
         "furigana-plain": "打[う]つ",
-        "glossary": "<div style=\"text-align: left;\"><i>(tag1, tag2, Test Dictionary 2)</i> <ul><li>definition7</li><li>definition8</li></ul></div>",
-        "glossary-brief": "<div style=\"text-align: left;\"><ul><li>definition7</li><li>definition8</li></ul></div>",
-        "glossary-no-dictionary": "<div style=\"text-align: left;\"><i>(tag1, tag2)</i> <ul><li>definition7</li><li>definition8</li></ul></div>",
+        "glossary": "<div style=\"text-align: left;\"><i>(vt, Test Dictionary 2)</i> <ul><li>utsu definition 3</li><li>utsu definition 4</li></ul></div>",
+        "glossary-brief": "<div style=\"text-align: left;\"><ul><li>utsu definition 3</li><li>utsu definition 4</li></ul></div>",
+        "glossary-no-dictionary": "<div style=\"text-align: left;\"><i>(vt)</i> <ul><li>utsu definition 3</li><li>utsu definition 4</li></ul></div>",
         "part-of-speech": "Godan verb",
         "pitch-accents": "No pitch accent data",
         "pitch-accent-graphs": "No pitch accent data",
@@ -2126,7 +2126,7 @@
         "screenshot": "<img src=\"\" />",
         "search-query": "fullQuery",
         "sentence": "cloze-prefix(打)(ち)cloze-suffix",
-        "tags": "tag1, tag2",
+        "tags": "vt",
         "url": "<a href=\"url:\">url:</a>"
       },
       {
@@ -2143,9 +2143,9 @@
         "frequencies": "<ul style=\"text-align: left;\"><li>Test Dictionary 2: 2</li><li>Test Dictionary 2: 7</li></ul>",
         "furigana": "<ruby>打<rt>ぶ</rt></ruby>つ",
         "furigana-plain": "打[ぶ]つ",
-        "glossary": "<div style=\"text-align: left;\"><i>(tag1, tag2, Test Dictionary 2)</i> <ul><li>definition11</li><li>definition12</li></ul></div>",
-        "glossary-brief": "<div style=\"text-align: left;\"><ul><li>definition11</li><li>definition12</li></ul></div>",
-        "glossary-no-dictionary": "<div style=\"text-align: left;\"><i>(tag1, tag2)</i> <ul><li>definition11</li><li>definition12</li></ul></div>",
+        "glossary": "<div style=\"text-align: left;\"><i>(vt, Test Dictionary 2)</i> <ul><li>butsu definition 3</li><li>butsu definition 4</li></ul></div>",
+        "glossary-brief": "<div style=\"text-align: left;\"><ul><li>butsu definition 3</li><li>butsu definition 4</li></ul></div>",
+        "glossary-no-dictionary": "<div style=\"text-align: left;\"><i>(vt)</i> <ul><li>butsu definition 3</li><li>butsu definition 4</li></ul></div>",
         "part-of-speech": "Godan verb",
         "pitch-accents": "No pitch accent data",
         "pitch-accent-graphs": "No pitch accent data",
@@ -2154,7 +2154,7 @@
         "screenshot": "<img src=\"\" />",
         "search-query": "fullQuery",
         "sentence": "cloze-prefix(打)(ち)cloze-suffix",
-        "tags": "tag1, tag2",
+        "tags": "vt",
         "url": "<a href=\"url:\">url:</a>"
       },
       {
@@ -2171,10 +2171,10 @@
         "frequencies": "<ul style=\"text-align: left;\"><li>Test Dictionary 2: 1</li><li>Test Dictionary 2: 4</li></ul>",
         "furigana": "<ruby>打<rt>だ</rt></ruby>",
         "furigana-plain": "打[だ]",
-        "glossary": "<div style=\"text-align: left;\"><i>(tag1, tag2, Test Dictionary 2)</i> <ul><li>definition1</li><li>definition2</li></ul></div>",
-        "glossary-brief": "<div style=\"text-align: left;\"><ul><li>definition1</li><li>definition2</li></ul></div>",
-        "glossary-no-dictionary": "<div style=\"text-align: left;\"><i>(tag1, tag2)</i> <ul><li>definition1</li><li>definition2</li></ul></div>",
-        "part-of-speech": "Unknown",
+        "glossary": "<div style=\"text-align: left;\"><i>(n, Test Dictionary 2)</i> <ul><li>da definition 1</li><li>da definition 2</li></ul></div>",
+        "glossary-brief": "<div style=\"text-align: left;\"><ul><li>da definition 1</li><li>da definition 2</li></ul></div>",
+        "glossary-no-dictionary": "<div style=\"text-align: left;\"><i>(n)</i> <ul><li>da definition 1</li><li>da definition 2</li></ul></div>",
+        "part-of-speech": "Noun",
         "pitch-accents": "No pitch accent data",
         "pitch-accent-graphs": "No pitch accent data",
         "pitch-accent-positions": "No pitch accent data",
@@ -2182,7 +2182,7 @@
         "screenshot": "<img src=\"\" />",
         "search-query": "fullQuery",
         "sentence": "cloze-prefix(打)cloze-suffix",
-        "tags": "tag1, tag2",
+        "tags": "n",
         "url": "<a href=\"url:\">url:</a>"
       },
       {
@@ -2199,10 +2199,10 @@
         "frequencies": "<ul style=\"text-align: left;\"><li>Test Dictionary 2: 1</li><li>Test Dictionary 2: 5</li></ul>",
         "furigana": "<ruby>打<rt>ダース</rt></ruby>",
         "furigana-plain": "打[ダース]",
-        "glossary": "<div style=\"text-align: left;\"><i>(tag1, tag2, Test Dictionary 2)</i> <ul><li>definition3</li><li>definition4</li></ul></div>",
-        "glossary-brief": "<div style=\"text-align: left;\"><ul><li>definition3</li><li>definition4</li></ul></div>",
-        "glossary-no-dictionary": "<div style=\"text-align: left;\"><i>(tag1, tag2)</i> <ul><li>definition3</li><li>definition4</li></ul></div>",
-        "part-of-speech": "Unknown",
+        "glossary": "<div style=\"text-align: left;\"><i>(abbr, n, Test Dictionary 2)</i> <ul><li>daasu definition 1</li><li>daasu definition 2</li></ul></div>",
+        "glossary-brief": "<div style=\"text-align: left;\"><ul><li>daasu definition 1</li><li>daasu definition 2</li></ul></div>",
+        "glossary-no-dictionary": "<div style=\"text-align: left;\"><i>(abbr, n)</i> <ul><li>daasu definition 1</li><li>daasu definition 2</li></ul></div>",
+        "part-of-speech": "Noun",
         "pitch-accents": "No pitch accent data",
         "pitch-accent-graphs": "No pitch accent data",
         "pitch-accent-positions": "No pitch accent data",
@@ -2210,7 +2210,7 @@
         "screenshot": "<img src=\"\" />",
         "search-query": "fullQuery",
         "sentence": "cloze-prefix(打)cloze-suffix",
-        "tags": "tag1, tag2",
+        "tags": "abbr, n",
         "url": "<a href=\"url:\">url:</a>"
       }
     ]
@@ -2232,9 +2232,9 @@
         "frequencies": "",
         "furigana": "<ruby>読<rt>よ</rt></ruby>む",
         "furigana-plain": "読[よ]む",
-        "glossary": "<div style=\"text-align: left;\"><i>(popular, Test Dictionary 2)</i> to read</div>",
+        "glossary": "<div style=\"text-align: left;\"><i>(vt, Test Dictionary 2)</i> to read</div>",
         "glossary-brief": "<div style=\"text-align: left;\">to read</div>",
-        "glossary-no-dictionary": "<div style=\"text-align: left;\"><i>(popular)</i> to read</div>",
+        "glossary-no-dictionary": "<div style=\"text-align: left;\"><i>(vt)</i> to read</div>",
         "part-of-speech": "Godan verb",
         "pitch-accents": "No pitch accent data",
         "pitch-accent-graphs": "No pitch accent data",
@@ -2243,7 +2243,7 @@
         "screenshot": "<img src=\"\" />",
         "search-query": "fullQuery",
         "sentence": "cloze-prefixtestcloze-suffix",
-        "tags": "popular",
+        "tags": "vt",
         "url": "<a href=\"url:\">url:</a>"
       }
     ]
@@ -2265,9 +2265,9 @@
         "frequencies": "",
         "furigana": "<ruby>強<rt>つよ</rt></ruby>み",
         "furigana-plain": "強[つよ]み",
-        "glossary": "<div style=\"text-align: left;\"><i>(popular, Test Dictionary 2)</i> strong point</div>",
+        "glossary": "<div style=\"text-align: left;\"><i>(n, Test Dictionary 2)</i> strong point</div>",
         "glossary-brief": "<div style=\"text-align: left;\">strong point</div>",
-        "glossary-no-dictionary": "<div style=\"text-align: left;\"><i>(popular)</i> strong point</div>",
+        "glossary-no-dictionary": "<div style=\"text-align: left;\"><i>(n)</i> strong point</div>",
         "part-of-speech": "Noun",
         "pitch-accents": "No pitch accent data",
         "pitch-accent-graphs": "No pitch accent data",
@@ -2276,7 +2276,7 @@
         "screenshot": "<img src=\"\" />",
         "search-query": "fullQuery",
         "sentence": "cloze-prefixつtestcloze-suffix",
-        "tags": "popular",
+        "tags": "n",
         "url": "<a href=\"url:\">url:</a>"
       }
     ]
@@ -2298,9 +2298,9 @@
         "frequencies": "",
         "furigana": "<ruby>読<rt>よ</rt></ruby>む",
         "furigana-plain": "読[よ]む",
-        "glossary": "<div style=\"text-align: left;\"><i>(popular, Test Dictionary 2)</i> to read</div>",
+        "glossary": "<div style=\"text-align: left;\"><i>(vt, Test Dictionary 2)</i> to read</div>",
         "glossary-brief": "<div style=\"text-align: left;\">to read</div>",
-        "glossary-no-dictionary": "<div style=\"text-align: left;\"><i>(popular)</i> to read</div>",
+        "glossary-no-dictionary": "<div style=\"text-align: left;\"><i>(vt)</i> to read</div>",
         "part-of-speech": "Godan verb",
         "pitch-accents": "No pitch accent data",
         "pitch-accent-graphs": "No pitch accent data",
@@ -2309,7 +2309,7 @@
         "screenshot": "<img src=\"\" />",
         "search-query": "fullQuery",
         "sentence": "cloze-prefixtestましたcloze-suffix",
-        "tags": "popular",
+        "tags": "vt",
         "url": "<a href=\"url:\">url:</a>"
       }
     ]
@@ -2331,9 +2331,9 @@
         "frequencies": "<ul style=\"text-align: left;\"><li>(<ruby>打<rt>う</rt></ruby>ち<ruby>込<rt>こ</rt></ruby>む) Test Dictionary 2: 3</li><li>(<ruby>打<rt>う</rt></ruby>ち<ruby>込<rt>こ</rt></ruby>む) Test Dictionary 2: 8</li><li>(<ruby>打<rt>ぶ</rt></ruby>ち<ruby>込<rt>こ</rt></ruby>む) Test Dictionary 2: 3</li><li>(<ruby>打<rt>ぶ</rt></ruby>ち<ruby>込<rt>こ</rt></ruby>む) Test Dictionary 2: 9</li></ul>",
         "furigana": "<span class=\"expression-normal\"><ruby>打<rt>う</rt></ruby>ち<ruby>込<rt>こ</rt></ruby>む</span>、<span class=\"expression-normal\"><ruby>打<rt>ぶ</rt></ruby>ち<ruby>込<rt>こ</rt></ruby>む</span>",
         "furigana-plain": "<span class=\"expression-normal\">打[う]ち 込[こ]む</span>、<span class=\"expression-normal\">打[ぶ]ち 込[こ]む</span>",
-        "glossary": "<div style=\"text-align: left;\"><ol><li><i>(tag1, tag2, Test Dictionary 2)</i> (うちこむ only) <ul><li>definition13</li><li>definition14</li></ul></li><li><i>(tag1, tag2, Test Dictionary 2)</i> (ぶちこむ only) <ul><li>definition17</li><li>definition18</li></ul></li><li><i>(tag1, tag2, Test Dictionary 2)</i> (うちこむ only) <ul><li>definition15</li><li>definition16</li></ul></li><li><i>(tag1, tag2, Test Dictionary 2)</i> (ぶちこむ only) <ul><li>definition19</li><li>definition20</li></ul></li></ol></div>",
-        "glossary-brief": "<div style=\"text-align: left;\"><ol><li><ul><li>definition13</li><li>definition14</li></ul></li><li><ul><li>definition17</li><li>definition18</li></ul></li><li><ul><li>definition15</li><li>definition16</li></ul></li><li><ul><li>definition19</li><li>definition20</li></ul></li></ol></div>",
-        "glossary-no-dictionary": "<div style=\"text-align: left;\"><ol><li><i>(tag1, tag2)</i> (うちこむ only) <ul><li>definition13</li><li>definition14</li></ul></li><li><i>(tag1, tag2)</i> (ぶちこむ only) <ul><li>definition17</li><li>definition18</li></ul></li><li><i>(tag1, tag2)</i> (うちこむ only) <ul><li>definition15</li><li>definition16</li></ul></li><li><i>(tag1, tag2)</i> (ぶちこむ only) <ul><li>definition19</li><li>definition20</li></ul></li></ol></div>",
+        "glossary": "<div style=\"text-align: left;\"><ol><li><i>(vt, Test Dictionary 2)</i> (うちこむ only) <ul><li>uchikomu definition 1</li><li>uchikomu definition 2</li></ul></li><li><i>(vt, Test Dictionary 2)</i> (ぶちこむ only) <ul><li>buchikomu definition 1</li><li>buchikomu definition 2</li></ul></li><li><i>(vt, Test Dictionary 2)</i> (うちこむ only) <ul><li>uchikomu definition 3</li><li>uchikomu definition 4</li></ul></li><li><i>(vt, Test Dictionary 2)</i> (ぶちこむ only) <ul><li>buchikomu definition 3</li><li>buchikomu definition 4</li></ul></li></ol></div>",
+        "glossary-brief": "<div style=\"text-align: left;\"><ol><li><ul><li>uchikomu definition 1</li><li>uchikomu definition 2</li></ul></li><li><ul><li>buchikomu definition 1</li><li>buchikomu definition 2</li></ul></li><li><ul><li>uchikomu definition 3</li><li>uchikomu definition 4</li></ul></li><li><ul><li>buchikomu definition 3</li><li>buchikomu definition 4</li></ul></li></ol></div>",
+        "glossary-no-dictionary": "<div style=\"text-align: left;\"><ol><li><i>(vt)</i> (うちこむ only) <ul><li>uchikomu definition 1</li><li>uchikomu definition 2</li></ul></li><li><i>(vt)</i> (ぶちこむ only) <ul><li>buchikomu definition 1</li><li>buchikomu definition 2</li></ul></li><li><i>(vt)</i> (うちこむ only) <ul><li>uchikomu definition 3</li><li>uchikomu definition 4</li></ul></li><li><i>(vt)</i> (ぶちこむ only) <ul><li>buchikomu definition 3</li><li>buchikomu definition 4</li></ul></li></ol></div>",
         "part-of-speech": "Godan verb",
         "pitch-accents": "<ol><li><em>(うちこむ only) </em><span><span style=\"display:inline-block;position:relative;\">う<span style=\"\"></span></span><span style=\"display:inline-block;position:relative;\">ち<span style=\"display:block;user-select:none;pointer-events:none;position:absolute;top:0.1em;left:0;right:0;height:0;border-top:0.1em solid;\"></span></span><span style=\"display:inline-block;position:relative;\">こ<span style=\"display:block;user-select:none;pointer-events:none;position:absolute;top:0.1em;left:0;right:0;height:0;border-top:0.1em solid;\"></span></span><span style=\"display:inline-block;position:relative;\">む<span style=\"display:block;user-select:none;pointer-events:none;position:absolute;top:0.1em;left:0;right:0;height:0;border-top:0.1em solid;\"></span></span></span></li><li><em>(うちこむ only) </em><span><span style=\"display:inline-block;position:relative;\">う<span style=\"\"></span></span><span style=\"display:inline-block;position:relative;\">ち<span style=\"display:block;user-select:none;pointer-events:none;position:absolute;top:0.1em;left:0;right:0;height:0;border-top:0.1em solid;\"></span></span><span style=\"display:inline-block;position:relative;padding-right:0.1em;margin-right:0.1em;\">こ<span style=\"display:block;user-select:none;pointer-events:none;position:absolute;top:0.1em;left:0;right:0;height:0;border-top:0.1em solid;right:-0.1em;height:0.4em;border-right:0.1em solid;\"></span></span><span style=\"display:inline-block;position:relative;\">む<span style=\"\"></span></span></span></li><li><em>(ぶちこむ only) </em><span><span style=\"display:inline-block;position:relative;\">ぶ<span style=\"\"></span></span><span style=\"display:inline-block;position:relative;\">ち<span style=\"display:block;user-select:none;pointer-events:none;position:absolute;top:0.1em;left:0;right:0;height:0;border-top:0.1em solid;\"></span></span><span style=\"display:inline-block;position:relative;\">こ<span style=\"display:block;user-select:none;pointer-events:none;position:absolute;top:0.1em;left:0;right:0;height:0;border-top:0.1em solid;\"></span></span><span style=\"display:inline-block;position:relative;\">む<span style=\"display:block;user-select:none;pointer-events:none;position:absolute;top:0.1em;left:0;right:0;height:0;border-top:0.1em solid;\"></span></span></span></li><li><em>(ぶちこむ only) </em><span><span style=\"display:inline-block;position:relative;\">ぶ<span style=\"\"></span></span><span style=\"display:inline-block;position:relative;\">ち<span style=\"display:block;user-select:none;pointer-events:none;position:absolute;top:0.1em;left:0;right:0;height:0;border-top:0.1em solid;\"></span></span><span style=\"display:inline-block;position:relative;padding-right:0.1em;margin-right:0.1em;\">こ<span style=\"display:block;user-select:none;pointer-events:none;position:absolute;top:0.1em;left:0;right:0;height:0;border-top:0.1em solid;right:-0.1em;height:0.4em;border-right:0.1em solid;\"></span></span><span style=\"display:inline-block;position:relative;\">む<span style=\"\"></span></span></span></li></ol>",
         "pitch-accent-graphs": "<ol><li><em>(うちこむ only) </em><svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 250 100\" style=\"display:inline-block;height:2em;\">\n    <defs>\n        <g id=\"term-pitch-accent-graph-dot\"><circle cx=\"0\" cy=\"0\" r=\"15\" style=\"fill:#000;stroke:#000;stroke-width:5;\" /></g>\n        <g id=\"term-pitch-accent-graph-dot-downstep\"><circle cx=\"0\" cy=\"0\" r=\"15\" style=\"fill:none;stroke:#000;stroke-width:5;\" /><circle cx=\"0\" cy=\"0\" r=\"5\" style=\"fill:none;stroke:#000;stroke-width:5;\" /></g>\n        <g id=\"term-pitch-accent-graph-triangle\"><path d=\"M0 13 L15 -13 L-15 -13 Z\" style=\"fill:none;stroke:#000;stroke-width:5;\" /></g>\n    </defs>\n    <path style=\"fill:none;stroke:#000;stroke-width:5;\" d=\"M25 75L75 25L125 25L175 25\"></path>\n    <path style=\"fill:none;stroke:#000;stroke-width:5;stroke-dasharray:5 5;\" d=\"M175 25 L225 25\"></path>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"25\" y=\"75\"></use>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"75\" y=\"25\"></use>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"125\" y=\"25\"></use>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"175\" y=\"25\"></use>\n    <use href=\"#term-pitch-accent-graph-triangle\" x=\"225\" y=\"25\"></use>\n</svg></li><li><em>(うちこむ only) </em><svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 250 100\" style=\"display:inline-block;height:2em;\">\n    <defs>\n        <g id=\"term-pitch-accent-graph-dot\"><circle cx=\"0\" cy=\"0\" r=\"15\" style=\"fill:#000;stroke:#000;stroke-width:5;\" /></g>\n        <g id=\"term-pitch-accent-graph-dot-downstep\"><circle cx=\"0\" cy=\"0\" r=\"15\" style=\"fill:none;stroke:#000;stroke-width:5;\" /><circle cx=\"0\" cy=\"0\" r=\"5\" style=\"fill:none;stroke:#000;stroke-width:5;\" /></g>\n        <g id=\"term-pitch-accent-graph-triangle\"><path d=\"M0 13 L15 -13 L-15 -13 Z\" style=\"fill:none;stroke:#000;stroke-width:5;\" /></g>\n    </defs>\n    <path style=\"fill:none;stroke:#000;stroke-width:5;\" d=\"M25 75L75 25L125 25L175 75\"></path>\n    <path style=\"fill:none;stroke:#000;stroke-width:5;stroke-dasharray:5 5;\" d=\"M175 75 L225 75\"></path>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"25\" y=\"75\"></use>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"75\" y=\"25\"></use>\n    <use href=\"#term-pitch-accent-graph-dot-downstep\" x=\"125\" y=\"25\"></use>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"175\" y=\"75\"></use>\n    <use href=\"#term-pitch-accent-graph-triangle\" x=\"225\" y=\"75\"></use>\n</svg></li><li><em>(ぶちこむ only) </em><svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 250 100\" style=\"display:inline-block;height:2em;\">\n    <defs>\n        <g id=\"term-pitch-accent-graph-dot\"><circle cx=\"0\" cy=\"0\" r=\"15\" style=\"fill:#000;stroke:#000;stroke-width:5;\" /></g>\n        <g id=\"term-pitch-accent-graph-dot-downstep\"><circle cx=\"0\" cy=\"0\" r=\"15\" style=\"fill:none;stroke:#000;stroke-width:5;\" /><circle cx=\"0\" cy=\"0\" r=\"5\" style=\"fill:none;stroke:#000;stroke-width:5;\" /></g>\n        <g id=\"term-pitch-accent-graph-triangle\"><path d=\"M0 13 L15 -13 L-15 -13 Z\" style=\"fill:none;stroke:#000;stroke-width:5;\" /></g>\n    </defs>\n    <path style=\"fill:none;stroke:#000;stroke-width:5;\" d=\"M25 75L75 25L125 25L175 25\"></path>\n    <path style=\"fill:none;stroke:#000;stroke-width:5;stroke-dasharray:5 5;\" d=\"M175 25 L225 25\"></path>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"25\" y=\"75\"></use>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"75\" y=\"25\"></use>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"125\" y=\"25\"></use>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"175\" y=\"25\"></use>\n    <use href=\"#term-pitch-accent-graph-triangle\" x=\"225\" y=\"25\"></use>\n</svg></li><li><em>(ぶちこむ only) </em><svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 250 100\" style=\"display:inline-block;height:2em;\">\n    <defs>\n        <g id=\"term-pitch-accent-graph-dot\"><circle cx=\"0\" cy=\"0\" r=\"15\" style=\"fill:#000;stroke:#000;stroke-width:5;\" /></g>\n        <g id=\"term-pitch-accent-graph-dot-downstep\"><circle cx=\"0\" cy=\"0\" r=\"15\" style=\"fill:none;stroke:#000;stroke-width:5;\" /><circle cx=\"0\" cy=\"0\" r=\"5\" style=\"fill:none;stroke:#000;stroke-width:5;\" /></g>\n        <g id=\"term-pitch-accent-graph-triangle\"><path d=\"M0 13 L15 -13 L-15 -13 Z\" style=\"fill:none;stroke:#000;stroke-width:5;\" /></g>\n    </defs>\n    <path style=\"fill:none;stroke:#000;stroke-width:5;\" d=\"M25 75L75 25L125 25L175 75\"></path>\n    <path style=\"fill:none;stroke:#000;stroke-width:5;stroke-dasharray:5 5;\" d=\"M175 75 L225 75\"></path>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"25\" y=\"75\"></use>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"75\" y=\"25\"></use>\n    <use href=\"#term-pitch-accent-graph-dot-downstep\" x=\"125\" y=\"25\"></use>\n    <use href=\"#term-pitch-accent-graph-dot\" x=\"175\" y=\"75\"></use>\n    <use href=\"#term-pitch-accent-graph-triangle\" x=\"225\" y=\"75\"></use>\n</svg></li></ol>",
@@ -2342,7 +2342,7 @@
         "screenshot": "<img src=\"\" />",
         "search-query": "fullQuery",
         "sentence": "cloze-prefixうちこむcloze-suffix",
-        "tags": "tag1, tag2",
+        "tags": "vt",
         "url": "<a href=\"url:\">url:</a>"
       },
       {
@@ -2359,9 +2359,9 @@
         "frequencies": "<ul style=\"text-align: left;\"><li>(<ruby>打<rt>う</rt></ruby>つ) Test Dictionary 2: 2</li><li>(<ruby>打<rt>う</rt></ruby>つ) Test Dictionary 2: 6</li><li>(<ruby>打<rt>ぶ</rt></ruby>つ) Test Dictionary 2: 2</li><li>(<ruby>打<rt>ぶ</rt></ruby>つ) Test Dictionary 2: 7</li></ul>",
         "furigana": "<span class=\"expression-normal\"><ruby>打<rt>う</rt></ruby>つ</span>、<span class=\"expression-normal\"><ruby>打<rt>ぶ</rt></ruby>つ</span>",
         "furigana-plain": "<span class=\"expression-normal\">打[う]つ</span>、<span class=\"expression-normal\">打[ぶ]つ</span>",
-        "glossary": "<div style=\"text-align: left;\"><ol><li><i>(tag1, tag2, Test Dictionary 2)</i> (うつ only) <ul><li>definition5</li><li>definition6</li></ul></li><li><i>(tag1, tag2, Test Dictionary 2)</i> (ぶつ only) <ul><li>definition9</li><li>definition10</li></ul></li><li><i>(tag1, tag2, Test Dictionary 2)</i> (うつ only) <ul><li>definition7</li><li>definition8</li></ul></li><li><i>(tag1, tag2, Test Dictionary 2)</i> (ぶつ only) <ul><li>definition11</li><li>definition12</li></ul></li></ol></div>",
-        "glossary-brief": "<div style=\"text-align: left;\"><ol><li><ul><li>definition5</li><li>definition6</li></ul></li><li><ul><li>definition9</li><li>definition10</li></ul></li><li><ul><li>definition7</li><li>definition8</li></ul></li><li><ul><li>definition11</li><li>definition12</li></ul></li></ol></div>",
-        "glossary-no-dictionary": "<div style=\"text-align: left;\"><ol><li><i>(tag1, tag2)</i> (うつ only) <ul><li>definition5</li><li>definition6</li></ul></li><li><i>(tag1, tag2)</i> (ぶつ only) <ul><li>definition9</li><li>definition10</li></ul></li><li><i>(tag1, tag2)</i> (うつ only) <ul><li>definition7</li><li>definition8</li></ul></li><li><i>(tag1, tag2)</i> (ぶつ only) <ul><li>definition11</li><li>definition12</li></ul></li></ol></div>",
+        "glossary": "<div style=\"text-align: left;\"><ol><li><i>(vt, Test Dictionary 2)</i> (うつ only) <ul><li>utsu definition 1</li><li>utsu definition 2</li></ul></li><li><i>(vt, Test Dictionary 2)</i> (ぶつ only) <ul><li>butsu definition 1</li><li>butsu definition 2</li></ul></li><li><i>(vt, Test Dictionary 2)</i> (うつ only) <ul><li>utsu definition 3</li><li>utsu definition 4</li></ul></li><li><i>(vt, Test Dictionary 2)</i> (ぶつ only) <ul><li>butsu definition 3</li><li>butsu definition 4</li></ul></li></ol></div>",
+        "glossary-brief": "<div style=\"text-align: left;\"><ol><li><ul><li>utsu definition 1</li><li>utsu definition 2</li></ul></li><li><ul><li>butsu definition 1</li><li>butsu definition 2</li></ul></li><li><ul><li>utsu definition 3</li><li>utsu definition 4</li></ul></li><li><ul><li>butsu definition 3</li><li>butsu definition 4</li></ul></li></ol></div>",
+        "glossary-no-dictionary": "<div style=\"text-align: left;\"><ol><li><i>(vt)</i> (うつ only) <ul><li>utsu definition 1</li><li>utsu definition 2</li></ul></li><li><i>(vt)</i> (ぶつ only) <ul><li>butsu definition 1</li><li>butsu definition 2</li></ul></li><li><i>(vt)</i> (うつ only) <ul><li>utsu definition 3</li><li>utsu definition 4</li></ul></li><li><i>(vt)</i> (ぶつ only) <ul><li>butsu definition 3</li><li>butsu definition 4</li></ul></li></ol></div>",
         "part-of-speech": "Godan verb",
         "pitch-accents": "No pitch accent data",
         "pitch-accent-graphs": "No pitch accent data",
@@ -2370,7 +2370,7 @@
         "screenshot": "<img src=\"\" />",
         "search-query": "fullQuery",
         "sentence": "cloze-prefixうちcloze-suffix",
-        "tags": "tag1, tag2",
+        "tags": "vt",
         "url": "<a href=\"url:\">url:</a>"
       }
     ]
diff --git a/test/data/dictionaries/valid-dictionary1/kanji_bank_1.json b/test/data/dictionaries/valid-dictionary1/kanji_bank_1.json
index 264f94c1..e1e81fc4 100644
--- a/test/data/dictionaries/valid-dictionary1/kanji_bank_1.json
+++ b/test/data/dictionaries/valid-dictionary1/kanji_bank_1.json
@@ -3,40 +3,40 @@
         "打",
         "ダ ダアス",
         "う.つ う.ち- ぶ.つ",
-        "ktag1 ktag2",
+        "K1 K2",
         [
-            "meaning1",
-            "meaning2",
-            "meaning3",
-            "meaning4",
-            "meaning5"
+            "utsu meaning 1",
+            "utsu meaning 2",
+            "utsu meaning 3",
+            "utsu meaning 4",
+            "utsu meaning 5"
         ],
         {
-            "kstat1": "1",
-            "kstat2": "2",
-            "kstat3": "3",
-            "kstat4": "4",
-            "kstat5": "5"
+            "kstat1": "kanji stat 1 value",
+            "kstat2": "kanji stat 2 value",
+            "kstat3": "kanji stat 3 value",
+            "kstat4": "kanji stat 4 value",
+            "kstat5": "kanji stat 5 value"
         }
     ],
     [
         "込",
         "",
         "-こ.む こ.む こ.み -こ.み こ.める",
-        "ktag1 ktag2",
+        "K1 K2",
         [
-            "meaning1",
-            "meaning2",
-            "meaning3",
-            "meaning4",
-            "meaning5"
+            "komu meaning 1",
+            "komu meaning 2",
+            "komu meaning 3",
+            "komu meaning 4",
+            "komu meaning 5"
         ],
         {
-            "kstat1": "1",
-            "kstat2": "2",
-            "kstat3": "3",
-            "kstat4": "4",
-            "kstat5": "5"
+            "kstat1": "kanji stat 1 value",
+            "kstat2": "kanji stat 2 value",
+            "kstat3": "kanji stat 3 value",
+            "kstat4": "kanji stat 4 value",
+            "kstat5": "kanji stat 5 value"
         }
     ]
 ]
\ No newline at end of file
diff --git a/test/data/dictionaries/valid-dictionary1/tag_bank_1.json b/test/data/dictionaries/valid-dictionary1/tag_bank_1.json
index 109ad395..3cdc322e 100644
--- a/test/data/dictionaries/valid-dictionary1/tag_bank_1.json
+++ b/test/data/dictionaries/valid-dictionary1/tag_bank_1.json
@@ -1,7 +1,8 @@
 [
-    ["tag1", "category1", 0, "tag1 notes", 0],
-    ["tag2", "category2", 0, "tag2 notes", 0],
-    ["tag3", "category3", 0, "tag3 notes", 0],
-    ["tag4", "category4", 0, "tag4 notes", 0],
-    ["tag5", "category5", 0, "tag5 notes", 0]
+    ["E1", "default", 0, "example tag 1", 0],
+    ["E2", "default", 0, "example tag 2", 0],
+    ["P", "popular", 0, "popular term", 0],
+    ["n", "partOfSpeech", 0, "noun", 0],
+    ["vt", "partOfSpeech", 0, "transitive verb", 0],
+    ["abbr", "default", 0, "abbreviation", 0]
 ]
\ No newline at end of file
diff --git a/test/data/dictionaries/valid-dictionary1/tag_bank_2.json b/test/data/dictionaries/valid-dictionary1/tag_bank_2.json
index 5e7936b3..34a9905d 100644
--- a/test/data/dictionaries/valid-dictionary1/tag_bank_2.json
+++ b/test/data/dictionaries/valid-dictionary1/tag_bank_2.json
@@ -1,9 +1,9 @@
 [
-    ["ktag1", "kcategory1", 0, "ktag1 notes", 0],
-    ["ktag2", "kcategory2", 0, "ktag2 notes", 0],
-    ["kstat1", "kcategory3", 0, "kstat1 notes", 0],
-    ["kstat2", "kcategory4", 0, "kstat2 notes", 0],
-    ["kstat3", "kcategory5", 0, "kstat3 notes", 0],
-    ["kstat4", "kcategory6", 0, "kstat4 notes", 0],
-    ["kstat5", "kcategory7", 0, "kstat5 notes", 0]
+    ["K1", "default", 0, "example kanji tag 1", 0],
+    ["K2", "default", 0, "example kanji tag 2", 0],
+    ["kstat1", "class", 0, "kanji stat 1", 0],
+    ["kstat2", "code", 0, "kanji stat 2", 0],
+    ["kstat3", "index", 0, "kanji stat 3", 0],
+    ["kstat4", "misc", 0, "kanji stat 4", 0],
+    ["kstat5", "misc", 0, "kanji stat 5", 0]
 ]
\ No newline at end of file
diff --git a/test/data/dictionaries/valid-dictionary1/tag_bank_3.json b/test/data/dictionaries/valid-dictionary1/tag_bank_3.json
index 572221fe..b5970584 100644
--- a/test/data/dictionaries/valid-dictionary1/tag_bank_3.json
+++ b/test/data/dictionaries/valid-dictionary1/tag_bank_3.json
@@ -1,4 +1,4 @@
 [
-    ["ptag1", "pcategory1", 0, "ptag1 notes", 0],
-    ["ptag2", "pcategory2", 0, "ptag2 notes", 0]
+    ["P1", "default", 0, "example pitch tag 1", 0],
+    ["P2", "default", 0, "example pitch tag 2", 0]
 ]
\ No newline at end of file
diff --git a/test/data/dictionaries/valid-dictionary1/term_bank_1.json b/test/data/dictionaries/valid-dictionary1/term_bank_1.json
index b86f6219..5094dd0f 100644
--- a/test/data/dictionaries/valid-dictionary1/term_bank_1.json
+++ b/test/data/dictionaries/valid-dictionary1/term_bank_1.json
@@ -1,35 +1,16 @@
 [
-    ["打", "だ", "tag1 tag2", "", 2, ["definition1a (打, だ)", "definition1b (打, だ)"], 1, "tag3 tag4 tag5"],
-    ["打", "ダース", "tag1 tag2", "", 1, ["definition1a (打, ダース)", "definition1b (打, ダース)"], 2, "tag3 tag4 tag5"],
-    ["打つ", "うつ", "tag1 tag2", "v5", 3, ["definition1a (打つ, うつ)", "definition1b (打つ, うつ)"], 3, "tag3 tag4 tag5"],
-    ["打つ", "うつ", "tag1 tag2", "v5", 4, ["definition2a (打つ, うつ)", "definition2b (打つ, うつ)"], 3, "tag3 tag4 tag5"],
-    ["打つ", "うつ", "tag1 tag2", "v5", 5, ["definition3a (打つ, うつ)", "definition3b (打つ, うつ)"], 3, "tag3 tag4 tag5"],
-    ["打つ", "うつ", "tag1 tag2", "v5", 6, ["definition4a (打つ, うつ)", "definition4b (打つ, うつ)"], 3, "tag3 tag4 tag5"],
-    ["打つ", "うつ", "tag1 tag2", "v5", 7, ["definition5a (打つ, うつ)", "definition5b (打つ, うつ)"], 3, "tag3 tag4 tag5"],
-    ["打つ", "うつ", "tag1 tag2", "v5", 8, ["definition6a (打つ, うつ)", "definition6b (打つ, うつ)"], 3, "tag3 tag4 tag5"],
-    ["打つ", "うつ", "tag1 tag2", "v5", 9, ["definition7a (打つ, うつ)", "definition7b (打つ, うつ)"], 3, "tag3 tag4 tag5"],
-    ["打つ", "うつ", "tag1 tag2", "v5", 10, ["definition8a (打つ, うつ)", "definition8b (打つ, うつ)"], 3, "tag3 tag4 tag5"],
-    ["打つ", "うつ", "tag1 tag2", "v5", 11, ["definition9a (打つ, うつ)", "definition9b (打つ, うつ)"], 3, "tag3 tag4 tag5"],
-    ["打つ", "うつ", "tag1 tag2", "v5", 12, ["definition10a (打つ, うつ)", "definition10b (打つ, うつ)"], 3, "tag3 tag4 tag5"],
-    ["打つ", "うつ", "tag1 tag2", "v5", 13, ["definition11a (打つ, うつ)", "definition11b (打つ, うつ)"], 3, "tag3 tag4 tag5"],
-    ["打つ", "うつ", "tag1 tag2", "v5", 14, ["definition12a (打つ, うつ)", "definition12b (打つ, うつ)"], 3, "tag3 tag4 tag5"],
-    ["打つ", "うつ", "tag1 tag2", "v5", 15, ["definition13a (打つ, うつ)", "definition13b (打つ, うつ)"], 3, "tag3 tag4 tag5"],
-    ["打つ", "うつ", "tag1 tag2", "v5", 16, ["definition14a (打つ, うつ)", "definition14b (打つ, うつ)"], 3, "tag3 tag4 tag5"],
-    ["打つ", "うつ", "tag1 tag2", "v5", 17, ["definition15a (打つ, うつ)", "definition15b (打つ, うつ)"], 3, "tag3 tag4 tag5"],
-    ["打つ", "ぶつ", "tag1 tag2", "v5", 18, ["definition1a (打つ, ぶつ)", "definition1b (打つ, ぶつ)"], 3, "tag3 tag4 tag5"],
-    ["打つ", "ぶつ", "tag1 tag2", "v5", 19, ["definition2a (打つ, ぶつ)", "definition2b (打つ, ぶつ)"], 3, "tag3 tag4 tag5"],
-    ["打ち込む", "うちこむ", "tag1 tag2", "v5", 20, ["definition1a (打ち込む, うちこむ)", "definition1b (打ち込む, うちこむ)"], 4, "tag3 tag4 tag5"],
-    ["打ち込む", "うちこむ", "tag1 tag2", "v5", 21, ["definition2a (打ち込む, うちこむ)", "definition2b (打ち込む, うちこむ)"], 4, "tag5 tag6 tag7"],
-    ["打ち込む", "うちこむ", "tag1 tag2", "v5", 22, ["definition3a (打ち込む, うちこむ)", "definition3b (打ち込む, うちこむ)"], 4, "tag5 tag6 tag7"],
-    ["打ち込む", "うちこむ", "tag1 tag2", "v5", 23, ["definition4a (打ち込む, うちこむ)", "definition4b (打ち込む, うちこむ)"], 4, "tag5 tag6 tag7"],
-    ["打ち込む", "うちこむ", "tag1 tag2", "v5", 24, ["definition5a (打ち込む, うちこむ)", "definition5b (打ち込む, うちこむ)"], 4, "tag5 tag6 tag7"],
-    ["打ち込む", "うちこむ", "tag1 tag2", "v5", 25, ["definition6a (打ち込む, うちこむ)", "definition6b (打ち込む, うちこむ)"], 4, "tag5 tag6 tag7"],
-    ["打ち込む", "うちこむ", "tag1 tag2", "v5", 26, ["definition7a (打ち込む, うちこむ)", "definition7b (打ち込む, うちこむ)"], 4, "tag5 tag6 tag7"],
-    ["打ち込む", "うちこむ", "tag1 tag2", "v5", 27, ["definition8a (打ち込む, うちこむ)", "definition8b (打ち込む, うちこむ)"], 4, "tag5 tag6 tag7"],
-    ["打ち込む", "うちこむ", "tag1 tag2", "v5", 28, ["definition9a (打ち込む, うちこむ)", "definition9b (打ち込む, うちこむ)"], 4, "tag5 tag6 tag7"],
-    ["打ち込む", "ぶちこむ", "tag1 tag2", "v5", 29, ["definition1a (打ち込む, ぶちこむ)", "definition1b (打ち込む, ぶちこむ)"], 4, "tag3 tag4 tag5"],
-    ["打ち込む", "ぶちこむ", "tag1 tag2", "v5", 30, ["definition2a (打ち込む, ぶちこむ)", "definition2b (打ち込む, ぶちこむ)"], 4, "tag3 tag4 tag5"],
-    ["打ち込む", "ぶちこむ", "tag1 tag2", "v5", 31, ["definition3a (打ち込む, ぶちこむ)", "definition3b (打ち込む, ぶちこむ)"], 4, "tag3 tag4 tag5"],
-    ["打ち込む", "ぶちこむ", "tag1 tag2", "v5", 32, ["definition4a (打ち込む, ぶちこむ)", "definition4b (打ち込む, ぶちこむ)"], 4, "tag3 tag4 tag5"],
-    ["画像", "がぞう", "tag1 tag2", "", 33, ["definition1a (画像, がぞう)", {"type": "image", "path": "image.gif", "width": 350, "height": 350, "description": "An image", "pixelated": true}], 5, "tag3 tag4 tag5"]
+    ["打", "だ", "n", "n", 1, ["da definition 1", "da definition 2"], 1, "E1"],
+    ["打", "ダース", "n abbr", "n", 1, ["daasu definition 1", "daasu definition 2"], 2, "E1"],
+    ["打つ", "うつ", "vt", "v5", 10, ["utsu definition 1", "utsu definition 2"], 3, "P E1"],
+    ["打つ", "うつ", "vt", "v5", 1,  ["utsu definition 3", "utsu definition 4"], 3, "P E2"],
+    ["打つ", "ぶつ", "vt", "v5", 10, ["butsu definition 1", "butsu definition 2"], 3, "P E1"],
+    ["打つ", "ぶつ", "vt", "v5", 1,  ["butsu definition 3", "butsu definition 4"], 3, "P E2"],
+    ["打ち込む", "うちこむ", "vt", "v5", 10, ["uchikomu definition 1", "uchikomu definition 2"], 4, "P E1"],
+    ["打ち込む", "うちこむ", "vt", "v5", 1,  ["uchikomu definition 3", "uchikomu definition 4"], 4, "P E2"],
+    ["打ち込む", "ぶちこむ", "vt", "v5", 10, ["buchikomu definition 1", "buchikomu definition 2"], 4, "P E1"],
+    ["打ち込む", "ぶちこむ", "vt", "v5", 1,  ["buchikomu definition 3", "buchikomu definition 4"], 4, "P E2"],
+    ["画像", "がぞう", "n", "n", 1, ["gazou definition 1", {"type": "image", "path": "image.gif", "width": 350, "height": 350, "description": "gazou definition 2", "pixelated": true}], 5, "P E1"],
+    ["読む", "よむ", "vt", "v5", 100, ["to read"], 6, "P E1"],
+    ["強み", "つよみ", "n", "n", 90, ["strong point"], 7, "P E1"],
+    ["テキスト", "テキスト", "n", "n", 1, ["text definition 1", {"type": "text", "text": "text definition 2"}], 8, "P E1"]
 ]
\ No newline at end of file
diff --git a/test/data/dictionaries/valid-dictionary1/term_meta_bank_1.json b/test/data/dictionaries/valid-dictionary1/term_meta_bank_1.json
index 73d74e68..829f5eeb 100644
--- a/test/data/dictionaries/valid-dictionary1/term_meta_bank_1.json
+++ b/test/data/dictionaries/valid-dictionary1/term_meta_bank_1.json
@@ -36,9 +36,9 @@
         {
             "reading": "おてまえ",
             "pitches": [
-                {"position": 2, "tags": ["ptag1"]},
-                {"position": 2, "tags": ["ptag2"]},
-                {"position": 0, "tags": ["ptag2"]}
+                {"position": 2, "tags": ["P1"]},
+                {"position": 2, "tags": ["P2"]},
+                {"position": 0, "tags": ["P2"]}
             ]
         }
     ]
diff --git a/test/data/dictionaries/valid-dictionary2/image.gif b/test/data/dictionaries/valid-dictionary2/image.gif
deleted file mode 100644
index f089d07c..00000000
--- a/test/data/dictionaries/valid-dictionary2/image.gif
+++ /dev/null
diff --git a/test/data/dictionaries/valid-dictionary2/index.json b/test/data/dictionaries/valid-dictionary2/index.json
deleted file mode 100644
index 6a957ad5..00000000
--- a/test/data/dictionaries/valid-dictionary2/index.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "title": "Test Dictionary 2",
-    "format": 3,
-    "revision": "test",
-    "sequenced": true
-}
\ No newline at end of file
diff --git a/test/data/dictionaries/valid-dictionary2/kanji_bank_1.json b/test/data/dictionaries/valid-dictionary2/kanji_bank_1.json
deleted file mode 100644
index 264f94c1..00000000
--- a/test/data/dictionaries/valid-dictionary2/kanji_bank_1.json
+++ /dev/null
@@ -1,42 +0,0 @@
-[
-    [
-        "打",
-        "ダ ダアス",
-        "う.つ う.ち- ぶ.つ",
-        "ktag1 ktag2",
-        [
-            "meaning1",
-            "meaning2",
-            "meaning3",
-            "meaning4",
-            "meaning5"
-        ],
-        {
-            "kstat1": "1",
-            "kstat2": "2",
-            "kstat3": "3",
-            "kstat4": "4",
-            "kstat5": "5"
-        }
-    ],
-    [
-        "込",
-        "",
-        "-こ.む こ.む こ.み -こ.み こ.める",
-        "ktag1 ktag2",
-        [
-            "meaning1",
-            "meaning2",
-            "meaning3",
-            "meaning4",
-            "meaning5"
-        ],
-        {
-            "kstat1": "1",
-            "kstat2": "2",
-            "kstat3": "3",
-            "kstat4": "4",
-            "kstat5": "5"
-        }
-    ]
-]
\ No newline at end of file
diff --git a/test/data/dictionaries/valid-dictionary2/kanji_meta_bank_1.json b/test/data/dictionaries/valid-dictionary2/kanji_meta_bank_1.json
deleted file mode 100644
index 73e75b8a..00000000
--- a/test/data/dictionaries/valid-dictionary2/kanji_meta_bank_1.json
+++ /dev/null
@@ -1,4 +0,0 @@
-[
-    ["打", "freq", 1],
-    ["込", "freq", 2]
-]
\ No newline at end of file
diff --git a/test/data/dictionaries/valid-dictionary2/tag_bank_1.json b/test/data/dictionaries/valid-dictionary2/tag_bank_1.json
deleted file mode 100644
index d66db94b..00000000
--- a/test/data/dictionaries/valid-dictionary2/tag_bank_1.json
+++ /dev/null
@@ -1,9 +0,0 @@
-[
-    ["tag1", "category1", 0, "tag1 notes", 0],
-    ["tag2", "category2", 0, "tag2 notes", 0],
-    ["tag3", "category3", 0, "tag3 notes", 0],
-    ["tag4", "category4", 0, "tag4 notes", 0],
-    ["tag5", "category5", 0, "tag5 notes", 0],
-    ["popular", "popular", 0, "popular term", 0],
-    ["vt", "partOfSpeech", 0, "transitive verb", 0]
-]
\ No newline at end of file
diff --git a/test/data/dictionaries/valid-dictionary2/tag_bank_2.json b/test/data/dictionaries/valid-dictionary2/tag_bank_2.json
deleted file mode 100644
index 5e7936b3..00000000
--- a/test/data/dictionaries/valid-dictionary2/tag_bank_2.json
+++ /dev/null
@@ -1,9 +0,0 @@
-[
-    ["ktag1", "kcategory1", 0, "ktag1 notes", 0],
-    ["ktag2", "kcategory2", 0, "ktag2 notes", 0],
-    ["kstat1", "kcategory3", 0, "kstat1 notes", 0],
-    ["kstat2", "kcategory4", 0, "kstat2 notes", 0],
-    ["kstat3", "kcategory5", 0, "kstat3 notes", 0],
-    ["kstat4", "kcategory6", 0, "kstat4 notes", 0],
-    ["kstat5", "kcategory7", 0, "kstat5 notes", 0]
-]
\ No newline at end of file
diff --git a/test/data/dictionaries/valid-dictionary2/tag_bank_3.json b/test/data/dictionaries/valid-dictionary2/tag_bank_3.json
deleted file mode 100644
index 572221fe..00000000
--- a/test/data/dictionaries/valid-dictionary2/tag_bank_3.json
+++ /dev/null
@@ -1,4 +0,0 @@
-[
-    ["ptag1", "pcategory1", 0, "ptag1 notes", 0],
-    ["ptag2", "pcategory2", 0, "ptag2 notes", 0]
-]
\ No newline at end of file
diff --git a/test/data/dictionaries/valid-dictionary2/term_bank_1.json b/test/data/dictionaries/valid-dictionary2/term_bank_1.json
deleted file mode 100644
index fcfe7365..00000000
--- a/test/data/dictionaries/valid-dictionary2/term_bank_1.json
+++ /dev/null
@@ -1,15 +0,0 @@
-[
-    ["打", "だ", "tag1 tag2", "", 1, ["definition1", "definition2"], 1, "tag3 tag4 tag5"],
-    ["打", "ダース", "tag1 tag2", "", 1, ["definition3", "definition4"], 2, "tag3 tag4 tag5"],
-    ["打つ", "うつ", "tag1 tag2", "v5", 10, ["definition5", "definition6"], 3, "tag3 tag4 tag5"],
-    ["打つ", "うつ", "tag1 tag2", "v5", 1, ["definition7", "definition8"], 3, "tag3 tag4 tag5"],
-    ["打つ", "ぶつ", "tag1 tag2", "v5", 10, ["definition9", "definition10"], 3, "tag3 tag4 tag5"],
-    ["打つ", "ぶつ", "tag1 tag2", "v5", 1, ["definition11", "definition12"], 3, "tag3 tag4 tag5"],
-    ["打ち込む", "うちこむ", "tag1 tag2", "v5", 10, ["definition13", "definition14"], 4, "tag3 tag4 tag5"],
-    ["打ち込む", "うちこむ", "tag1 tag2", "v5", 1, ["definition15", "definition16"], 4, "tag5 tag6 tag7"],
-    ["打ち込む", "ぶちこむ", "tag1 tag2", "v5", 10, ["definition17", "definition18"], 4, "tag3 tag4 tag5"],
-    ["打ち込む", "ぶちこむ", "tag1 tag2", "v5", 1, ["definition19", "definition20"], 4, "tag3 tag4 tag5"],
-    ["画像", "がぞう", "tag1 tag2", "", 1, ["definition21", {"type": "image", "path": "image.gif", "width": 350, "height": 350, "description": "An image", "pixelated": true}], 5, "tag3 tag4 tag5"],
-    ["読む", "よむ", "popular", "v5", 100, ["to read"], 6, "vt"],
-    ["強み", "つよみ", "popular", "n", 90, ["strong point"], 7, ""]
-]
\ No newline at end of file
diff --git a/test/data/dictionaries/valid-dictionary2/term_meta_bank_1.json b/test/data/dictionaries/valid-dictionary2/term_meta_bank_1.json
deleted file mode 100644
index 587dfdd4..00000000
--- a/test/data/dictionaries/valid-dictionary2/term_meta_bank_1.json
+++ /dev/null
@@ -1,33 +0,0 @@
-[
-    ["打", "freq", 1],
-    ["打つ", "freq", 2],
-    ["打ち込む", "freq", 3],
-    ["打", "freq", {"reading": "だ", "frequency": 4}],
-    ["打", "freq", {"reading": "ダース", "frequency": 5}],
-    ["打つ", "freq", {"reading": "うつ", "frequency": 6}],
-    ["打つ", "freq", {"reading": "ぶつ", "frequency": 7}],
-    ["打ち込む", "freq", {"reading": "うちこむ", "frequency": 8}],
-    ["打ち込む", "freq", {"reading": "ぶちこむ", "frequency": 9}],
-    [
-        "打ち込む",
-        "pitch",
-        {
-            "reading": "うちこむ",
-            "pitches": [
-                {"position": 0},
-                {"position": 3}
-            ]
-        }
-    ],
-    [
-        "打ち込む",
-        "pitch",
-        {
-            "reading": "ぶちこむ",
-            "pitches": [
-                {"position": 0},
-                {"position": 3}
-            ]
-        }
-    ]
-]
\ No newline at end of file
diff --git a/test/data/translator-test-results-note-data1.json b/test/data/translator-test-results-note-data1.json
index 740e6661..07e7d86f 100644
--- a/test/data/translator-test-results-note-data1.json
+++ b/test/data/translator-test-results-note-data1.json
@@ -18,26 +18,26 @@
             "ぶ.つ"
           ],
           "glossary": [
-            "meaning1",
-            "meaning2",
-            "meaning3",
-            "meaning4",
-            "meaning5"
+            "utsu meaning 1",
+            "utsu meaning 2",
+            "utsu meaning 3",
+            "utsu meaning 4",
+            "utsu meaning 5"
           ],
           "tags": [
             {
-              "name": "ktag1",
-              "category": "kcategory1",
-              "notes": "ktag1 notes",
+              "name": "K1",
+              "category": "default",
+              "notes": "example kanji tag 1",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
               "redundant": false
             },
             {
-              "name": "ktag2",
-              "category": "kcategory2",
-              "notes": "ktag2 notes",
+              "name": "K2",
+              "category": "default",
+              "notes": "example kanji tag 2",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -45,59 +45,57 @@
             }
           ],
           "stats": {
-            "kcategory3": [
+            "class": [
               {
                 "name": "kstat1",
-                "category": "kcategory3",
-                "notes": "kstat1 notes",
+                "category": "class",
+                "notes": "kanji stat 1",
                 "order": 0,
                 "score": 0,
                 "dictionary": "Test Dictionary 2",
-                "value": "1"
+                "value": "kanji stat 1 value"
               }
             ],
-            "kcategory4": [
+            "code": [
               {
                 "name": "kstat2",
-                "category": "kcategory4",
-                "notes": "kstat2 notes",
+                "category": "code",
+                "notes": "kanji stat 2",
                 "order": 0,
                 "score": 0,
                 "dictionary": "Test Dictionary 2",
-                "value": "2"
+                "value": "kanji stat 2 value"
               }
             ],
-            "kcategory5": [
+            "index": [
               {
                 "name": "kstat3",
-                "category": "kcategory5",
-                "notes": "kstat3 notes",
+                "category": "index",
+                "notes": "kanji stat 3",
                 "order": 0,
                 "score": 0,
                 "dictionary": "Test Dictionary 2",
-                "value": "3"
+                "value": "kanji stat 3 value"
               }
             ],
-            "kcategory6": [
+            "misc": [
               {
                 "name": "kstat4",
-                "category": "kcategory6",
-                "notes": "kstat4 notes",
+                "category": "misc",
+                "notes": "kanji stat 4",
                 "order": 0,
                 "score": 0,
                 "dictionary": "Test Dictionary 2",
-                "value": "4"
-              }
-            ],
-            "kcategory7": [
+                "value": "kanji stat 4 value"
+              },
               {
                 "name": "kstat5",
-                "category": "kcategory7",
-                "notes": "kstat5 notes",
+                "category": "misc",
+                "notes": "kanji stat 5",
                 "order": 0,
                 "score": 0,
                 "dictionary": "Test Dictionary 2",
-                "value": "5"
+                "value": "kanji stat 5 value"
               }
             ]
           },
@@ -165,26 +163,26 @@
             "こ.める"
           ],
           "glossary": [
-            "meaning1",
-            "meaning2",
-            "meaning3",
-            "meaning4",
-            "meaning5"
+            "komu meaning 1",
+            "komu meaning 2",
+            "komu meaning 3",
+            "komu meaning 4",
+            "komu meaning 5"
           ],
           "tags": [
             {
-              "name": "ktag1",
-              "category": "kcategory1",
-              "notes": "ktag1 notes",
+              "name": "K1",
+              "category": "default",
+              "notes": "example kanji tag 1",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
               "redundant": false
             },
             {
-              "name": "ktag2",
-              "category": "kcategory2",
-              "notes": "ktag2 notes",
+              "name": "K2",
+              "category": "default",
+              "notes": "example kanji tag 2",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -192,59 +190,57 @@
             }
           ],
           "stats": {
-            "kcategory3": [
+            "class": [
               {
                 "name": "kstat1",
-                "category": "kcategory3",
-                "notes": "kstat1 notes",
+                "category": "class",
+                "notes": "kanji stat 1",
                 "order": 0,
                 "score": 0,
                 "dictionary": "Test Dictionary 2",
-                "value": "1"
+                "value": "kanji stat 1 value"
               }
             ],
-            "kcategory4": [
+            "code": [
               {
                 "name": "kstat2",
-                "category": "kcategory4",
-                "notes": "kstat2 notes",
+                "category": "code",
+                "notes": "kanji stat 2",
                 "order": 0,
                 "score": 0,
                 "dictionary": "Test Dictionary 2",
-                "value": "2"
+                "value": "kanji stat 2 value"
               }
             ],
-            "kcategory5": [
+            "index": [
               {
                 "name": "kstat3",
-                "category": "kcategory5",
-                "notes": "kstat3 notes",
+                "category": "index",
+                "notes": "kanji stat 3",
                 "order": 0,
                 "score": 0,
                 "dictionary": "Test Dictionary 2",
-                "value": "3"
+                "value": "kanji stat 3 value"
               }
             ],
-            "kcategory6": [
+            "misc": [
               {
                 "name": "kstat4",
-                "category": "kcategory6",
-                "notes": "kstat4 notes",
+                "category": "misc",
+                "notes": "kanji stat 4",
                 "order": 0,
                 "score": 0,
                 "dictionary": "Test Dictionary 2",
-                "value": "4"
-              }
-            ],
-            "kcategory7": [
+                "value": "kanji stat 4 value"
+              },
               {
                 "name": "kstat5",
-                "category": "kcategory7",
-                "notes": "kstat5 notes",
+                "category": "misc",
+                "notes": "kanji stat 5",
                 "order": 0,
                 "score": 0,
                 "dictionary": "Test Dictionary 2",
-                "value": "5"
+                "value": "kanji stat 5 value"
               }
             ]
           },
@@ -330,27 +326,9 @@
               "reading": "だ",
               "termTags": [
                 {
-                  "name": "tag3",
-                  "category": "category3",
-                  "notes": "tag3 notes",
-                  "order": 0,
-                  "score": 0,
-                  "dictionary": "Test Dictionary 2",
-                  "redundant": false
-                },
-                {
-                  "name": "tag4",
-                  "category": "category4",
-                  "notes": "tag4 notes",
-                  "order": 0,
-                  "score": 0,
-                  "dictionary": "Test Dictionary 2",
-                  "redundant": false
-                },
-                {
-                  "name": "tag5",
-                  "category": "category5",
-                  "notes": "tag5 notes",
+                  "name": "E1",
+                  "category": "default",
+                  "notes": "example tag 1",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
@@ -393,27 +371,20 @@
                 }
               ],
               "termFrequency": "normal",
-              "wordClasses": []
+              "wordClasses": [
+                "n"
+              ]
             }
           ],
           "glossary": [
-            "definition1",
-            "definition2"
+            "da definition 1",
+            "da definition 2"
           ],
           "definitionTags": [
             {
-              "name": "tag1",
-              "category": "category1",
-              "notes": "tag1 notes",
-              "order": 0,
-              "score": 0,
-              "dictionary": "Test Dictionary 2",
-              "redundant": false
-            },
-            {
-              "name": "tag2",
-              "category": "category2",
-              "notes": "tag2 notes",
+              "name": "n",
+              "category": "partOfSpeech",
+              "notes": "noun",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -422,27 +393,9 @@
           ],
           "termTags": [
             {
-              "name": "tag3",
-              "category": "category3",
-              "notes": "tag3 notes",
-              "order": 0,
-              "score": 0,
-              "dictionary": "Test Dictionary 2",
-              "redundant": false
-            },
-            {
-              "name": "tag4",
-              "category": "category4",
-              "notes": "tag4 notes",
-              "order": 0,
-              "score": 0,
-              "dictionary": "Test Dictionary 2",
-              "redundant": false
-            },
-            {
-              "name": "tag5",
-              "category": "category5",
-              "notes": "tag5 notes",
+              "name": "E1",
+              "category": "default",
+              "notes": "example tag 1",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -550,27 +503,9 @@
               "reading": "ダース",
               "termTags": [
                 {
-                  "name": "tag3",
-                  "category": "category3",
-                  "notes": "tag3 notes",
-                  "order": 0,
-                  "score": 0,
-                  "dictionary": "Test Dictionary 2",
-                  "redundant": false
-                },
-                {
-                  "name": "tag4",
-                  "category": "category4",
-                  "notes": "tag4 notes",
-                  "order": 0,
-                  "score": 0,
-                  "dictionary": "Test Dictionary 2",
-                  "redundant": false
-                },
-                {
-                  "name": "tag5",
-                  "category": "category5",
-                  "notes": "tag5 notes",
+                  "name": "E1",
+                  "category": "default",
+                  "notes": "example tag 1",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
@@ -613,27 +548,29 @@
                 }
               ],
               "termFrequency": "normal",
-              "wordClasses": []
+              "wordClasses": [
+                "n"
+              ]
             }
           ],
           "glossary": [
-            "definition3",
-            "definition4"
+            "daasu definition 1",
+            "daasu definition 2"
           ],
           "definitionTags": [
             {
-              "name": "tag1",
-              "category": "category1",
-              "notes": "tag1 notes",
+              "name": "abbr",
+              "category": "default",
+              "notes": "abbreviation",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
               "redundant": false
             },
             {
-              "name": "tag2",
-              "category": "category2",
-              "notes": "tag2 notes",
+              "name": "n",
+              "category": "partOfSpeech",
+              "notes": "noun",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -642,27 +579,9 @@
           ],
           "termTags": [
             {
-              "name": "tag3",
-              "category": "category3",
-              "notes": "tag3 notes",
-              "order": 0,
-              "score": 0,
-              "dictionary": "Test Dictionary 2",
-              "redundant": false
-            },
-            {
-              "name": "tag4",
-              "category": "category4",
-              "notes": "tag4 notes",
-              "order": 0,
-              "score": 0,
-              "dictionary": "Test Dictionary 2",
-              "redundant": false
-            },
-            {
-              "name": "tag5",
-              "category": "category5",
-              "notes": "tag5 notes",
+              "name": "E1",
+              "category": "default",
+              "notes": "example tag 1",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -775,27 +694,18 @@
               "reading": "うつ",
               "termTags": [
                 {
-                  "name": "tag3",
-                  "category": "category3",
-                  "notes": "tag3 notes",
-                  "order": 0,
-                  "score": 0,
-                  "dictionary": "Test Dictionary 2",
-                  "redundant": false
-                },
-                {
-                  "name": "tag4",
-                  "category": "category4",
-                  "notes": "tag4 notes",
+                  "name": "E1",
+                  "category": "default",
+                  "notes": "example tag 1",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
                   "redundant": false
                 },
                 {
-                  "name": "tag5",
-                  "category": "category5",
-                  "notes": "tag5 notes",
+                  "name": "P",
+                  "category": "popular",
+                  "notes": "popular term",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
@@ -848,23 +758,14 @@
             }
           ],
           "glossary": [
-            "definition5",
-            "definition6"
+            "utsu definition 1",
+            "utsu definition 2"
           ],
           "definitionTags": [
             {
-              "name": "tag1",
-              "category": "category1",
-              "notes": "tag1 notes",
-              "order": 0,
-              "score": 0,
-              "dictionary": "Test Dictionary 2",
-              "redundant": false
-            },
-            {
-              "name": "tag2",
-              "category": "category2",
-              "notes": "tag2 notes",
+              "name": "vt",
+              "category": "partOfSpeech",
+              "notes": "transitive verb",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -873,27 +774,18 @@
           ],
           "termTags": [
             {
-              "name": "tag3",
-              "category": "category3",
-              "notes": "tag3 notes",
-              "order": 0,
-              "score": 0,
-              "dictionary": "Test Dictionary 2",
-              "redundant": false
-            },
-            {
-              "name": "tag4",
-              "category": "category4",
-              "notes": "tag4 notes",
+              "name": "E1",
+              "category": "default",
+              "notes": "example tag 1",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
               "redundant": false
             },
             {
-              "name": "tag5",
-              "category": "category5",
-              "notes": "tag5 notes",
+              "name": "P",
+              "category": "popular",
+              "notes": "popular term",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -1005,27 +897,18 @@
               "reading": "ぶつ",
               "termTags": [
                 {
-                  "name": "tag3",
-                  "category": "category3",
-                  "notes": "tag3 notes",
-                  "order": 0,
-                  "score": 0,
-                  "dictionary": "Test Dictionary 2",
-                  "redundant": false
-                },
-                {
-                  "name": "tag4",
-                  "category": "category4",
-                  "notes": "tag4 notes",
+                  "name": "E1",
+                  "category": "default",
+                  "notes": "example tag 1",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
                   "redundant": false
                 },
                 {
-                  "name": "tag5",
-                  "category": "category5",
-                  "notes": "tag5 notes",
+                  "name": "P",
+                  "category": "popular",
+                  "notes": "popular term",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
@@ -1078,23 +961,14 @@
             }
           ],
           "glossary": [
-            "definition9",
-            "definition10"
+            "butsu definition 1",
+            "butsu definition 2"
           ],
           "definitionTags": [
             {
-              "name": "tag1",
-              "category": "category1",
-              "notes": "tag1 notes",
-              "order": 0,
-              "score": 0,
-              "dictionary": "Test Dictionary 2",
-              "redundant": false
-            },
-            {
-              "name": "tag2",
-              "category": "category2",
-              "notes": "tag2 notes",
+              "name": "vt",
+              "category": "partOfSpeech",
+              "notes": "transitive verb",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -1103,27 +977,18 @@
           ],
           "termTags": [
             {
-              "name": "tag3",
-              "category": "category3",
-              "notes": "tag3 notes",
-              "order": 0,
-              "score": 0,
-              "dictionary": "Test Dictionary 2",
-              "redundant": false
-            },
-            {
-              "name": "tag4",
-              "category": "category4",
-              "notes": "tag4 notes",
+              "name": "E1",
+              "category": "default",
+              "notes": "example tag 1",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
               "redundant": false
             },
             {
-              "name": "tag5",
-              "category": "category5",
-              "notes": "tag5 notes",
+              "name": "P",
+              "category": "popular",
+              "notes": "popular term",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -1235,27 +1100,18 @@
               "reading": "うつ",
               "termTags": [
                 {
-                  "name": "tag3",
-                  "category": "category3",
-                  "notes": "tag3 notes",
-                  "order": 0,
-                  "score": 0,
-                  "dictionary": "Test Dictionary 2",
-                  "redundant": false
-                },
-                {
-                  "name": "tag4",
-                  "category": "category4",
-                  "notes": "tag4 notes",
+                  "name": "E2",
+                  "category": "default",
+                  "notes": "example tag 2",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
                   "redundant": false
                 },
                 {
-                  "name": "tag5",
-                  "category": "category5",
-                  "notes": "tag5 notes",
+                  "name": "P",
+                  "category": "popular",
+                  "notes": "popular term",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
@@ -1308,23 +1164,14 @@
             }
           ],
           "glossary": [
-            "definition7",
-            "definition8"
+            "utsu definition 3",
+            "utsu definition 4"
           ],
           "definitionTags": [
             {
-              "name": "tag1",
-              "category": "category1",
-              "notes": "tag1 notes",
-              "order": 0,
-              "score": 0,
-              "dictionary": "Test Dictionary 2",
-              "redundant": false
-            },
-            {
-              "name": "tag2",
-              "category": "category2",
-              "notes": "tag2 notes",
+              "name": "vt",
+              "category": "partOfSpeech",
+              "notes": "transitive verb",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -1333,27 +1180,18 @@
           ],
           "termTags": [
             {
-              "name": "tag3",
-              "category": "category3",
-              "notes": "tag3 notes",
-              "order": 0,
-              "score": 0,
-              "dictionary": "Test Dictionary 2",
-              "redundant": false
-            },
-            {
-              "name": "tag4",
-              "category": "category4",
-              "notes": "tag4 notes",
+              "name": "E2",
+              "category": "default",
+              "notes": "example tag 2",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
               "redundant": false
             },
             {
-              "name": "tag5",
-              "category": "category5",
-              "notes": "tag5 notes",
+              "name": "P",
+              "category": "popular",
+              "notes": "popular term",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -1465,27 +1303,18 @@
               "reading": "ぶつ",
               "termTags": [
                 {
-                  "name": "tag3",
-                  "category": "category3",
-                  "notes": "tag3 notes",
-                  "order": 0,
-                  "score": 0,
-                  "dictionary": "Test Dictionary 2",
-                  "redundant": false
-                },
-                {
-                  "name": "tag4",
-                  "category": "category4",
-                  "notes": "tag4 notes",
+                  "name": "E2",
+                  "category": "default",
+                  "notes": "example tag 2",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
                   "redundant": false
                 },
                 {
-                  "name": "tag5",
-                  "category": "category5",
-                  "notes": "tag5 notes",
+                  "name": "P",
+                  "category": "popular",
+                  "notes": "popular term",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
@@ -1538,23 +1367,14 @@
             }
           ],
           "glossary": [
-            "definition11",
-            "definition12"
+            "butsu definition 3",
+            "butsu definition 4"
           ],
           "definitionTags": [
             {
-              "name": "tag1",
-              "category": "category1",
-              "notes": "tag1 notes",
-              "order": 0,
-              "score": 0,
-              "dictionary": "Test Dictionary 2",
-              "redundant": false
-            },
-            {
-              "name": "tag2",
-              "category": "category2",
-              "notes": "tag2 notes",
+              "name": "vt",
+              "category": "partOfSpeech",
+              "notes": "transitive verb",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -1563,27 +1383,18 @@
           ],
           "termTags": [
             {
-              "name": "tag3",
-              "category": "category3",
-              "notes": "tag3 notes",
-              "order": 0,
-              "score": 0,
-              "dictionary": "Test Dictionary 2",
-              "redundant": false
-            },
-            {
-              "name": "tag4",
-              "category": "category4",
-              "notes": "tag4 notes",
+              "name": "E2",
+              "category": "default",
+              "notes": "example tag 2",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
               "redundant": false
             },
             {
-              "name": "tag5",
-              "category": "category5",
-              "notes": "tag5 notes",
+              "name": "P",
+              "category": "popular",
+              "notes": "popular term",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -1695,27 +1506,9 @@
               "reading": "だ",
               "termTags": [
                 {
-                  "name": "tag3",
-                  "category": "category3",
-                  "notes": "tag3 notes",
-                  "order": 0,
-                  "score": 0,
-                  "dictionary": "Test Dictionary 2",
-                  "redundant": false
-                },
-                {
-                  "name": "tag4",
-                  "category": "category4",
-                  "notes": "tag4 notes",
-                  "order": 0,
-                  "score": 0,
-                  "dictionary": "Test Dictionary 2",
-                  "redundant": false
-                },
-                {
-                  "name": "tag5",
-                  "category": "category5",
-                  "notes": "tag5 notes",
+                  "name": "E1",
+                  "category": "default",
+                  "notes": "example tag 1",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
@@ -1758,27 +1551,20 @@
                 }
               ],
               "termFrequency": "normal",
-              "wordClasses": []
+              "wordClasses": [
+                "n"
+              ]
             }
           ],
           "glossary": [
-            "definition1",
-            "definition2"
+            "da definition 1",
+            "da definition 2"
           ],
           "definitionTags": [
             {
-              "name": "tag1",
-              "category": "category1",
-              "notes": "tag1 notes",
-              "order": 0,
-              "score": 0,
-              "dictionary": "Test Dictionary 2",
-              "redundant": false
-            },
-            {
-              "name": "tag2",
-              "category": "category2",
-              "notes": "tag2 notes",
+              "name": "n",
+              "category": "partOfSpeech",
+              "notes": "noun",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -1787,27 +1573,9 @@
           ],
           "termTags": [
             {
-              "name": "tag3",
-              "category": "category3",
-              "notes": "tag3 notes",
-              "order": 0,
-              "score": 0,
-              "dictionary": "Test Dictionary 2",
-              "redundant": false
-            },
-            {
-              "name": "tag4",
-              "category": "category4",
-              "notes": "tag4 notes",
-              "order": 0,
-              "score": 0,
-              "dictionary": "Test Dictionary 2",
-              "redundant": false
-            },
-            {
-              "name": "tag5",
-              "category": "category5",
-              "notes": "tag5 notes",
+              "name": "E1",
+              "category": "default",
+              "notes": "example tag 1",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -1915,27 +1683,9 @@
               "reading": "ダース",
               "termTags": [
                 {
-                  "name": "tag3",
-                  "category": "category3",
-                  "notes": "tag3 notes",
-                  "order": 0,
-                  "score": 0,
-                  "dictionary": "Test Dictionary 2",
-                  "redundant": false
-                },
-                {
-                  "name": "tag4",
-                  "category": "category4",
-                  "notes": "tag4 notes",
-                  "order": 0,
-                  "score": 0,
-                  "dictionary": "Test Dictionary 2",
-                  "redundant": false
-                },
-                {
-                  "name": "tag5",
-                  "category": "category5",
-                  "notes": "tag5 notes",
+                  "name": "E1",
+                  "category": "default",
+                  "notes": "example tag 1",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
@@ -1978,27 +1728,29 @@
                 }
               ],
               "termFrequency": "normal",
-              "wordClasses": []
+              "wordClasses": [
+                "n"
+              ]
             }
           ],
           "glossary": [
-            "definition3",
-            "definition4"
+            "daasu definition 1",
+            "daasu definition 2"
           ],
           "definitionTags": [
             {
-              "name": "tag1",
-              "category": "category1",
-              "notes": "tag1 notes",
+              "name": "abbr",
+              "category": "default",
+              "notes": "abbreviation",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
               "redundant": false
             },
             {
-              "name": "tag2",
-              "category": "category2",
-              "notes": "tag2 notes",
+              "name": "n",
+              "category": "partOfSpeech",
+              "notes": "noun",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -2007,27 +1759,9 @@
           ],
           "termTags": [
             {
-              "name": "tag3",
-              "category": "category3",
-              "notes": "tag3 notes",
-              "order": 0,
-              "score": 0,
-              "dictionary": "Test Dictionary 2",
-              "redundant": false
-            },
-            {
-              "name": "tag4",
-              "category": "category4",
-              "notes": "tag4 notes",
-              "order": 0,
-              "score": 0,
-              "dictionary": "Test Dictionary 2",
-              "redundant": false
-            },
-            {
-              "name": "tag5",
-              "category": "category5",
-              "notes": "tag5 notes",
+              "name": "E1",
+              "category": "default",
+              "notes": "example tag 1",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -2140,27 +1874,18 @@
               "reading": "うちこむ",
               "termTags": [
                 {
-                  "name": "tag3",
-                  "category": "category3",
-                  "notes": "tag3 notes",
-                  "order": 0,
-                  "score": 0,
-                  "dictionary": "Test Dictionary 2",
-                  "redundant": false
-                },
-                {
-                  "name": "tag4",
-                  "category": "category4",
-                  "notes": "tag4 notes",
+                  "name": "E1",
+                  "category": "default",
+                  "notes": "example tag 1",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
                   "redundant": false
                 },
                 {
-                  "name": "tag5",
-                  "category": "category5",
-                  "notes": "tag5 notes",
+                  "name": "P",
+                  "category": "popular",
+                  "notes": "popular term",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
@@ -2243,23 +1968,14 @@
             }
           ],
           "glossary": [
-            "definition13",
-            "definition14"
+            "uchikomu definition 1",
+            "uchikomu definition 2"
           ],
           "definitionTags": [
             {
-              "name": "tag1",
-              "category": "category1",
-              "notes": "tag1 notes",
-              "order": 0,
-              "score": 0,
-              "dictionary": "Test Dictionary 2",
-              "redundant": false
-            },
-            {
-              "name": "tag2",
-              "category": "category2",
-              "notes": "tag2 notes",
+              "name": "vt",
+              "category": "partOfSpeech",
+              "notes": "transitive verb",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -2268,27 +1984,18 @@
           ],
           "termTags": [
             {
-              "name": "tag3",
-              "category": "category3",
-              "notes": "tag3 notes",
-              "order": 0,
-              "score": 0,
-              "dictionary": "Test Dictionary 2",
-              "redundant": false
-            },
-            {
-              "name": "tag4",
-              "category": "category4",
-              "notes": "tag4 notes",
+              "name": "E1",
+              "category": "default",
+              "notes": "example tag 1",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
               "redundant": false
             },
             {
-              "name": "tag5",
-              "category": "category5",
-              "notes": "tag5 notes",
+              "name": "P",
+              "category": "popular",
+              "notes": "popular term",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -2456,27 +2163,18 @@
               "reading": "ぶちこむ",
               "termTags": [
                 {
-                  "name": "tag3",
-                  "category": "category3",
-                  "notes": "tag3 notes",
-                  "order": 0,
-                  "score": 0,
-                  "dictionary": "Test Dictionary 2",
-                  "redundant": false
-                },
-                {
-                  "name": "tag4",
-                  "category": "category4",
-                  "notes": "tag4 notes",
+                  "name": "E1",
+                  "category": "default",
+                  "notes": "example tag 1",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
                   "redundant": false
                 },
                 {
-                  "name": "tag5",
-                  "category": "category5",
-                  "notes": "tag5 notes",
+                  "name": "P",
+                  "category": "popular",
+                  "notes": "popular term",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
@@ -2559,23 +2257,14 @@
             }
           ],
           "glossary": [
-            "definition17",
-            "definition18"
+            "buchikomu definition 1",
+            "buchikomu definition 2"
           ],
           "definitionTags": [
             {
-              "name": "tag1",
-              "category": "category1",
-              "notes": "tag1 notes",
-              "order": 0,
-              "score": 0,
-              "dictionary": "Test Dictionary 2",
-              "redundant": false
-            },
-            {
-              "name": "tag2",
-              "category": "category2",
-              "notes": "tag2 notes",
+              "name": "vt",
+              "category": "partOfSpeech",
+              "notes": "transitive verb",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -2584,27 +2273,18 @@
           ],
           "termTags": [
             {
-              "name": "tag3",
-              "category": "category3",
-              "notes": "tag3 notes",
-              "order": 0,
-              "score": 0,
-              "dictionary": "Test Dictionary 2",
-              "redundant": false
-            },
-            {
-              "name": "tag4",
-              "category": "category4",
-              "notes": "tag4 notes",
+              "name": "E1",
+              "category": "default",
+              "notes": "example tag 1",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
               "redundant": false
             },
             {
-              "name": "tag5",
-              "category": "category5",
-              "notes": "tag5 notes",
+              "name": "P",
+              "category": "popular",
+              "notes": "popular term",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -2772,27 +2452,18 @@
               "reading": "うちこむ",
               "termTags": [
                 {
-                  "name": "tag5",
-                  "category": "category5",
-                  "notes": "tag5 notes",
-                  "order": 0,
-                  "score": 0,
-                  "dictionary": "Test Dictionary 2",
-                  "redundant": false
-                },
-                {
-                  "name": "tag6",
+                  "name": "E2",
                   "category": "default",
-                  "notes": "",
+                  "notes": "example tag 2",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
                   "redundant": false
                 },
                 {
-                  "name": "tag7",
-                  "category": "default",
-                  "notes": "",
+                  "name": "P",
+                  "category": "popular",
+                  "notes": "popular term",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
@@ -2875,23 +2546,14 @@
             }
           ],
           "glossary": [
-            "definition15",
-            "definition16"
+            "uchikomu definition 3",
+            "uchikomu definition 4"
           ],
           "definitionTags": [
             {
-              "name": "tag1",
-              "category": "category1",
-              "notes": "tag1 notes",
-              "order": 0,
-              "score": 0,
-              "dictionary": "Test Dictionary 2",
-              "redundant": false
-            },
-            {
-              "name": "tag2",
-              "category": "category2",
-              "notes": "tag2 notes",
+              "name": "vt",
+              "category": "partOfSpeech",
+              "notes": "transitive verb",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -2900,27 +2562,18 @@
           ],
           "termTags": [
             {
-              "name": "tag5",
-              "category": "category5",
-              "notes": "tag5 notes",
-              "order": 0,
-              "score": 0,
-              "dictionary": "Test Dictionary 2",
-              "redundant": false
-            },
-            {
-              "name": "tag6",
+              "name": "E2",
               "category": "default",
-              "notes": "",
+              "notes": "example tag 2",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
               "redundant": false
             },
             {
-              "name": "tag7",
-              "category": "default",
-              "notes": "",
+              "name": "P",
+              "category": "popular",
+              "notes": "popular term",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -3088,27 +2741,18 @@
               "reading": "ぶちこむ",
               "termTags": [
                 {
-                  "name": "tag3",
-                  "category": "category3",
-                  "notes": "tag3 notes",
-                  "order": 0,
-                  "score": 0,
-                  "dictionary": "Test Dictionary 2",
-                  "redundant": false
-                },
-                {
-                  "name": "tag4",
-                  "category": "category4",
-                  "notes": "tag4 notes",
+                  "name": "E2",
+                  "category": "default",
+                  "notes": "example tag 2",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
                   "redundant": false
                 },
                 {
-                  "name": "tag5",
-                  "category": "category5",
-                  "notes": "tag5 notes",
+                  "name": "P",
+                  "category": "popular",
+                  "notes": "popular term",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
@@ -3191,23 +2835,14 @@
             }
           ],
           "glossary": [
-            "definition19",
-            "definition20"
+            "buchikomu definition 3",
+            "buchikomu definition 4"
           ],
           "definitionTags": [
             {
-              "name": "tag1",
-              "category": "category1",
-              "notes": "tag1 notes",
-              "order": 0,
-              "score": 0,
-              "dictionary": "Test Dictionary 2",
-              "redundant": false
-            },
-            {
-              "name": "tag2",
-              "category": "category2",
-              "notes": "tag2 notes",
+              "name": "vt",
+              "category": "partOfSpeech",
+              "notes": "transitive verb",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -3216,27 +2851,18 @@
           ],
           "termTags": [
             {
-              "name": "tag3",
-              "category": "category3",
-              "notes": "tag3 notes",
-              "order": 0,
-              "score": 0,
-              "dictionary": "Test Dictionary 2",
-              "redundant": false
-            },
-            {
-              "name": "tag4",
-              "category": "category4",
-              "notes": "tag4 notes",
+              "name": "E2",
+              "category": "default",
+              "notes": "example tag 2",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
               "redundant": false
             },
             {
-              "name": "tag5",
-              "category": "category5",
-              "notes": "tag5 notes",
+              "name": "P",
+              "category": "popular",
+              "notes": "popular term",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -3406,27 +3032,18 @@
               "reading": "うつ",
               "termTags": [
                 {
-                  "name": "tag3",
-                  "category": "category3",
-                  "notes": "tag3 notes",
-                  "order": 0,
-                  "score": 0,
-                  "dictionary": "Test Dictionary 2",
-                  "redundant": false
-                },
-                {
-                  "name": "tag4",
-                  "category": "category4",
-                  "notes": "tag4 notes",
+                  "name": "E1",
+                  "category": "default",
+                  "notes": "example tag 1",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
                   "redundant": false
                 },
                 {
-                  "name": "tag5",
-                  "category": "category5",
-                  "notes": "tag5 notes",
+                  "name": "P",
+                  "category": "popular",
+                  "notes": "popular term",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
@@ -3479,23 +3096,14 @@
             }
           ],
           "glossary": [
-            "definition5",
-            "definition6"
+            "utsu definition 1",
+            "utsu definition 2"
           ],
           "definitionTags": [
             {
-              "name": "tag1",
-              "category": "category1",
-              "notes": "tag1 notes",
-              "order": 0,
-              "score": 0,
-              "dictionary": "Test Dictionary 2",
-              "redundant": false
-            },
-            {
-              "name": "tag2",
-              "category": "category2",
-              "notes": "tag2 notes",
+              "name": "vt",
+              "category": "partOfSpeech",
+              "notes": "transitive verb",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -3504,27 +3112,18 @@
           ],
           "termTags": [
             {
-              "name": "tag3",
-              "category": "category3",
-              "notes": "tag3 notes",
-              "order": 0,
-              "score": 0,
-              "dictionary": "Test Dictionary 2",
-              "redundant": false
-            },
-            {
-              "name": "tag4",
-              "category": "category4",
-              "notes": "tag4 notes",
+              "name": "E1",
+              "category": "default",
+              "notes": "example tag 1",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
               "redundant": false
             },
             {
-              "name": "tag5",
-              "category": "category5",
-              "notes": "tag5 notes",
+              "name": "P",
+              "category": "popular",
+              "notes": "popular term",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -3638,27 +3237,18 @@
               "reading": "ぶつ",
               "termTags": [
                 {
-                  "name": "tag3",
-                  "category": "category3",
-                  "notes": "tag3 notes",
-                  "order": 0,
-                  "score": 0,
-                  "dictionary": "Test Dictionary 2",
-                  "redundant": false
-                },
-                {
-                  "name": "tag4",
-                  "category": "category4",
-                  "notes": "tag4 notes",
+                  "name": "E1",
+                  "category": "default",
+                  "notes": "example tag 1",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
                   "redundant": false
                 },
                 {
-                  "name": "tag5",
-                  "category": "category5",
-                  "notes": "tag5 notes",
+                  "name": "P",
+                  "category": "popular",
+                  "notes": "popular term",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
@@ -3711,23 +3301,14 @@
             }
           ],
           "glossary": [
-            "definition9",
-            "definition10"
+            "butsu definition 1",
+            "butsu definition 2"
           ],
           "definitionTags": [
             {
-              "name": "tag1",
-              "category": "category1",
-              "notes": "tag1 notes",
-              "order": 0,
-              "score": 0,
-              "dictionary": "Test Dictionary 2",
-              "redundant": false
-            },
-            {
-              "name": "tag2",
-              "category": "category2",
-              "notes": "tag2 notes",
+              "name": "vt",
+              "category": "partOfSpeech",
+              "notes": "transitive verb",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -3736,27 +3317,18 @@
           ],
           "termTags": [
             {
-              "name": "tag3",
-              "category": "category3",
-              "notes": "tag3 notes",
-              "order": 0,
-              "score": 0,
-              "dictionary": "Test Dictionary 2",
-              "redundant": false
-            },
-            {
-              "name": "tag4",
-              "category": "category4",
-              "notes": "tag4 notes",
+              "name": "E1",
+              "category": "default",
+              "notes": "example tag 1",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
               "redundant": false
             },
             {
-              "name": "tag5",
-              "category": "category5",
-              "notes": "tag5 notes",
+              "name": "P",
+              "category": "popular",
+              "notes": "popular term",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -3870,27 +3442,18 @@
               "reading": "うつ",
               "termTags": [
                 {
-                  "name": "tag3",
-                  "category": "category3",
-                  "notes": "tag3 notes",
-                  "order": 0,
-                  "score": 0,
-                  "dictionary": "Test Dictionary 2",
-                  "redundant": false
-                },
-                {
-                  "name": "tag4",
-                  "category": "category4",
-                  "notes": "tag4 notes",
+                  "name": "E2",
+                  "category": "default",
+                  "notes": "example tag 2",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
                   "redundant": false
                 },
                 {
-                  "name": "tag5",
-                  "category": "category5",
-                  "notes": "tag5 notes",
+                  "name": "P",
+                  "category": "popular",
+                  "notes": "popular term",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
@@ -3943,23 +3506,14 @@
             }
           ],
           "glossary": [
-            "definition7",
-            "definition8"
+            "utsu definition 3",
+            "utsu definition 4"
           ],
           "definitionTags": [
             {
-              "name": "tag1",
-              "category": "category1",
-              "notes": "tag1 notes",
-              "order": 0,
-              "score": 0,
-              "dictionary": "Test Dictionary 2",
-              "redundant": false
-            },
-            {
-              "name": "tag2",
-              "category": "category2",
-              "notes": "tag2 notes",
+              "name": "vt",
+              "category": "partOfSpeech",
+              "notes": "transitive verb",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -3968,27 +3522,18 @@
           ],
           "termTags": [
             {
-              "name": "tag3",
-              "category": "category3",
-              "notes": "tag3 notes",
-              "order": 0,
-              "score": 0,
-              "dictionary": "Test Dictionary 2",
-              "redundant": false
-            },
-            {
-              "name": "tag4",
-              "category": "category4",
-              "notes": "tag4 notes",
+              "name": "E2",
+              "category": "default",
+              "notes": "example tag 2",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
               "redundant": false
             },
             {
-              "name": "tag5",
-              "category": "category5",
-              "notes": "tag5 notes",
+              "name": "P",
+              "category": "popular",
+              "notes": "popular term",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -4102,27 +3647,18 @@
               "reading": "ぶつ",
               "termTags": [
                 {
-                  "name": "tag3",
-                  "category": "category3",
-                  "notes": "tag3 notes",
-                  "order": 0,
-                  "score": 0,
-                  "dictionary": "Test Dictionary 2",
-                  "redundant": false
-                },
-                {
-                  "name": "tag4",
-                  "category": "category4",
-                  "notes": "tag4 notes",
+                  "name": "E2",
+                  "category": "default",
+                  "notes": "example tag 2",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
                   "redundant": false
                 },
                 {
-                  "name": "tag5",
-                  "category": "category5",
-                  "notes": "tag5 notes",
+                  "name": "P",
+                  "category": "popular",
+                  "notes": "popular term",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
@@ -4175,23 +3711,14 @@
             }
           ],
           "glossary": [
-            "definition11",
-            "definition12"
+            "butsu definition 3",
+            "butsu definition 4"
           ],
           "definitionTags": [
             {
-              "name": "tag1",
-              "category": "category1",
-              "notes": "tag1 notes",
-              "order": 0,
-              "score": 0,
-              "dictionary": "Test Dictionary 2",
-              "redundant": false
-            },
-            {
-              "name": "tag2",
-              "category": "category2",
-              "notes": "tag2 notes",
+              "name": "vt",
+              "category": "partOfSpeech",
+              "notes": "transitive verb",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -4200,27 +3727,18 @@
           ],
           "termTags": [
             {
-              "name": "tag3",
-              "category": "category3",
-              "notes": "tag3 notes",
-              "order": 0,
-              "score": 0,
-              "dictionary": "Test Dictionary 2",
-              "redundant": false
-            },
-            {
-              "name": "tag4",
-              "category": "category4",
-              "notes": "tag4 notes",
+              "name": "E2",
+              "category": "default",
+              "notes": "example tag 2",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
               "redundant": false
             },
             {
-              "name": "tag5",
-              "category": "category5",
-              "notes": "tag5 notes",
+              "name": "P",
+              "category": "popular",
+              "notes": "popular term",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -4332,27 +3850,9 @@
               "reading": "だ",
               "termTags": [
                 {
-                  "name": "tag3",
-                  "category": "category3",
-                  "notes": "tag3 notes",
-                  "order": 0,
-                  "score": 0,
-                  "dictionary": "Test Dictionary 2",
-                  "redundant": false
-                },
-                {
-                  "name": "tag4",
-                  "category": "category4",
-                  "notes": "tag4 notes",
-                  "order": 0,
-                  "score": 0,
-                  "dictionary": "Test Dictionary 2",
-                  "redundant": false
-                },
-                {
-                  "name": "tag5",
-                  "category": "category5",
-                  "notes": "tag5 notes",
+                  "name": "E1",
+                  "category": "default",
+                  "notes": "example tag 1",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
@@ -4395,27 +3895,20 @@
                 }
               ],
               "termFrequency": "normal",
-              "wordClasses": []
+              "wordClasses": [
+                "n"
+              ]
             }
           ],
           "glossary": [
-            "definition1",
-            "definition2"
+            "da definition 1",
+            "da definition 2"
           ],
           "definitionTags": [
             {
-              "name": "tag1",
-              "category": "category1",
-              "notes": "tag1 notes",
-              "order": 0,
-              "score": 0,
-              "dictionary": "Test Dictionary 2",
-              "redundant": false
-            },
-            {
-              "name": "tag2",
-              "category": "category2",
-              "notes": "tag2 notes",
+              "name": "n",
+              "category": "partOfSpeech",
+              "notes": "noun",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -4424,27 +3917,9 @@
           ],
           "termTags": [
             {
-              "name": "tag3",
-              "category": "category3",
-              "notes": "tag3 notes",
-              "order": 0,
-              "score": 0,
-              "dictionary": "Test Dictionary 2",
-              "redundant": false
-            },
-            {
-              "name": "tag4",
-              "category": "category4",
-              "notes": "tag4 notes",
-              "order": 0,
-              "score": 0,
-              "dictionary": "Test Dictionary 2",
-              "redundant": false
-            },
-            {
-              "name": "tag5",
-              "category": "category5",
-              "notes": "tag5 notes",
+              "name": "E1",
+              "category": "default",
+              "notes": "example tag 1",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -4552,27 +4027,9 @@
               "reading": "ダース",
               "termTags": [
                 {
-                  "name": "tag3",
-                  "category": "category3",
-                  "notes": "tag3 notes",
-                  "order": 0,
-                  "score": 0,
-                  "dictionary": "Test Dictionary 2",
-                  "redundant": false
-                },
-                {
-                  "name": "tag4",
-                  "category": "category4",
-                  "notes": "tag4 notes",
-                  "order": 0,
-                  "score": 0,
-                  "dictionary": "Test Dictionary 2",
-                  "redundant": false
-                },
-                {
-                  "name": "tag5",
-                  "category": "category5",
-                  "notes": "tag5 notes",
+                  "name": "E1",
+                  "category": "default",
+                  "notes": "example tag 1",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
@@ -4615,27 +4072,29 @@
                 }
               ],
               "termFrequency": "normal",
-              "wordClasses": []
+              "wordClasses": [
+                "n"
+              ]
             }
           ],
           "glossary": [
-            "definition3",
-            "definition4"
+            "daasu definition 1",
+            "daasu definition 2"
           ],
           "definitionTags": [
             {
-              "name": "tag1",
-              "category": "category1",
-              "notes": "tag1 notes",
+              "name": "abbr",
+              "category": "default",
+              "notes": "abbreviation",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
               "redundant": false
             },
             {
-              "name": "tag2",
-              "category": "category2",
-              "notes": "tag2 notes",
+              "name": "n",
+              "category": "partOfSpeech",
+              "notes": "noun",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -4644,27 +4103,9 @@
           ],
           "termTags": [
             {
-              "name": "tag3",
-              "category": "category3",
-              "notes": "tag3 notes",
-              "order": 0,
-              "score": 0,
-              "dictionary": "Test Dictionary 2",
-              "redundant": false
-            },
-            {
-              "name": "tag4",
-              "category": "category4",
-              "notes": "tag4 notes",
-              "order": 0,
-              "score": 0,
-              "dictionary": "Test Dictionary 2",
-              "redundant": false
-            },
-            {
-              "name": "tag5",
-              "category": "category5",
-              "notes": "tag5 notes",
+              "name": "E1",
+              "category": "default",
+              "notes": "example tag 1",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -4777,27 +4218,18 @@
               "reading": "がぞう",
               "termTags": [
                 {
-                  "name": "tag3",
-                  "category": "category3",
-                  "notes": "tag3 notes",
-                  "order": 0,
-                  "score": 0,
-                  "dictionary": "Test Dictionary 2",
-                  "redundant": false
-                },
-                {
-                  "name": "tag4",
-                  "category": "category4",
-                  "notes": "tag4 notes",
+                  "name": "E1",
+                  "category": "default",
+                  "notes": "example tag 1",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
                   "redundant": false
                 },
                 {
-                  "name": "tag5",
-                  "category": "category5",
-                  "notes": "tag5 notes",
+                  "name": "P",
+                  "category": "popular",
+                  "notes": "popular term",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
@@ -4813,11 +4245,13 @@
                 }
               ],
               "termFrequency": "normal",
-              "wordClasses": []
+              "wordClasses": [
+                "n"
+              ]
             }
           ],
           "glossary": [
-            "definition21",
+            "gazou definition 1",
             {
               "type": "image",
               "path": "image.gif",
@@ -4825,24 +4259,15 @@
               "height": 100,
               "preferredWidth": 350,
               "preferredHeight": 350,
-              "description": "An image",
+              "description": "gazou definition 2",
               "pixelated": true
             }
           ],
           "definitionTags": [
             {
-              "name": "tag1",
-              "category": "category1",
-              "notes": "tag1 notes",
-              "order": 0,
-              "score": 0,
-              "dictionary": "Test Dictionary 2",
-              "redundant": false
-            },
-            {
-              "name": "tag2",
-              "category": "category2",
-              "notes": "tag2 notes",
+              "name": "n",
+              "category": "partOfSpeech",
+              "notes": "noun",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -4851,27 +4276,18 @@
           ],
           "termTags": [
             {
-              "name": "tag3",
-              "category": "category3",
-              "notes": "tag3 notes",
-              "order": 0,
-              "score": 0,
-              "dictionary": "Test Dictionary 2",
-              "redundant": false
-            },
-            {
-              "name": "tag4",
-              "category": "category4",
-              "notes": "tag4 notes",
+              "name": "E1",
+              "category": "default",
+              "notes": "example tag 1",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
               "redundant": false
             },
             {
-              "name": "tag5",
-              "category": "category5",
-              "notes": "tag5 notes",
+              "name": "P",
+              "category": "popular",
+              "notes": "popular term",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -4957,27 +4373,9 @@
               "reading": "だ",
               "termTags": [
                 {
-                  "name": "tag3",
-                  "category": "category3",
-                  "notes": "tag3 notes",
-                  "order": 0,
-                  "score": 0,
-                  "dictionary": "Test Dictionary 2",
-                  "redundant": false
-                },
-                {
-                  "name": "tag4",
-                  "category": "category4",
-                  "notes": "tag4 notes",
-                  "order": 0,
-                  "score": 0,
-                  "dictionary": "Test Dictionary 2",
-                  "redundant": false
-                },
-                {
-                  "name": "tag5",
-                  "category": "category5",
-                  "notes": "tag5 notes",
+                  "name": "E1",
+                  "category": "default",
+                  "notes": "example tag 1",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
@@ -5020,27 +4418,20 @@
                 }
               ],
               "termFrequency": "normal",
-              "wordClasses": []
+              "wordClasses": [
+                "n"
+              ]
             }
           ],
           "glossary": [
-            "definition1",
-            "definition2"
+            "da definition 1",
+            "da definition 2"
           ],
           "definitionTags": [
             {
-              "name": "tag1",
-              "category": "category1",
-              "notes": "tag1 notes",
-              "order": 0,
-              "score": 0,
-              "dictionary": "Test Dictionary 2",
-              "redundant": false
-            },
-            {
-              "name": "tag2",
-              "category": "category2",
-              "notes": "tag2 notes",
+              "name": "n",
+              "category": "partOfSpeech",
+              "notes": "noun",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -5049,27 +4440,9 @@
           ],
           "termTags": [
             {
-              "name": "tag3",
-              "category": "category3",
-              "notes": "tag3 notes",
-              "order": 0,
-              "score": 0,
-              "dictionary": "Test Dictionary 2",
-              "redundant": false
-            },
-            {
-              "name": "tag4",
-              "category": "category4",
-              "notes": "tag4 notes",
-              "order": 0,
-              "score": 0,
-              "dictionary": "Test Dictionary 2",
-              "redundant": false
-            },
-            {
-              "name": "tag5",
-              "category": "category5",
-              "notes": "tag5 notes",
+              "name": "E1",
+              "category": "default",
+              "notes": "example tag 1",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -5182,27 +4555,9 @@
               "reading": "ダース",
               "termTags": [
                 {
-                  "name": "tag3",
-                  "category": "category3",
-                  "notes": "tag3 notes",
-                  "order": 0,
-                  "score": 0,
-                  "dictionary": "Test Dictionary 2",
-                  "redundant": false
-                },
-                {
-                  "name": "tag4",
-                  "category": "category4",
-                  "notes": "tag4 notes",
-                  "order": 0,
-                  "score": 0,
-                  "dictionary": "Test Dictionary 2",
-                  "redundant": false
-                },
-                {
-                  "name": "tag5",
-                  "category": "category5",
-                  "notes": "tag5 notes",
+                  "name": "E1",
+                  "category": "default",
+                  "notes": "example tag 1",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
@@ -5245,27 +4600,29 @@
                 }
               ],
               "termFrequency": "normal",
-              "wordClasses": []
+              "wordClasses": [
+                "n"
+              ]
             }
           ],
           "glossary": [
-            "definition3",
-            "definition4"
+            "daasu definition 1",
+            "daasu definition 2"
           ],
           "definitionTags": [
             {
-              "name": "tag1",
-              "category": "category1",
-              "notes": "tag1 notes",
+              "name": "abbr",
+              "category": "default",
+              "notes": "abbreviation",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
               "redundant": false
             },
             {
-              "name": "tag2",
-              "category": "category2",
-              "notes": "tag2 notes",
+              "name": "n",
+              "category": "partOfSpeech",
+              "notes": "noun",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -5274,27 +4631,9 @@
           ],
           "termTags": [
             {
-              "name": "tag3",
-              "category": "category3",
-              "notes": "tag3 notes",
-              "order": 0,
-              "score": 0,
-              "dictionary": "Test Dictionary 2",
-              "redundant": false
-            },
-            {
-              "name": "tag4",
-              "category": "category4",
-              "notes": "tag4 notes",
-              "order": 0,
-              "score": 0,
-              "dictionary": "Test Dictionary 2",
-              "redundant": false
-            },
-            {
-              "name": "tag5",
-              "category": "category5",
-              "notes": "tag5 notes",
+              "name": "E1",
+              "category": "default",
+              "notes": "example tag 1",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -5407,27 +4746,18 @@
               "reading": "うつ",
               "termTags": [
                 {
-                  "name": "tag3",
-                  "category": "category3",
-                  "notes": "tag3 notes",
-                  "order": 0,
-                  "score": 0,
-                  "dictionary": "Test Dictionary 2",
-                  "redundant": false
-                },
-                {
-                  "name": "tag4",
-                  "category": "category4",
-                  "notes": "tag4 notes",
+                  "name": "E1",
+                  "category": "default",
+                  "notes": "example tag 1",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
                   "redundant": false
                 },
                 {
-                  "name": "tag5",
-                  "category": "category5",
-                  "notes": "tag5 notes",
+                  "name": "P",
+                  "category": "popular",
+                  "notes": "popular term",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
@@ -5480,23 +4810,14 @@
             }
           ],
           "glossary": [
-            "definition5",
-            "definition6"
+            "utsu definition 1",
+            "utsu definition 2"
           ],
           "definitionTags": [
             {
-              "name": "tag1",
-              "category": "category1",
-              "notes": "tag1 notes",
-              "order": 0,
-              "score": 0,
-              "dictionary": "Test Dictionary 2",
-              "redundant": false
-            },
-            {
-              "name": "tag2",
-              "category": "category2",
-              "notes": "tag2 notes",
+              "name": "vt",
+              "category": "partOfSpeech",
+              "notes": "transitive verb",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -5505,27 +4826,18 @@
           ],
           "termTags": [
             {
-              "name": "tag3",
-              "category": "category3",
-              "notes": "tag3 notes",
-              "order": 0,
-              "score": 0,
-              "dictionary": "Test Dictionary 2",
-              "redundant": false
-            },
-            {
-              "name": "tag4",
-              "category": "category4",
-              "notes": "tag4 notes",
+              "name": "E1",
+              "category": "default",
+              "notes": "example tag 1",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
               "redundant": false
             },
             {
-              "name": "tag5",
-              "category": "category5",
-              "notes": "tag5 notes",
+              "name": "P",
+              "category": "popular",
+              "notes": "popular term",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -5637,27 +4949,18 @@
               "reading": "うつ",
               "termTags": [
                 {
-                  "name": "tag3",
-                  "category": "category3",
-                  "notes": "tag3 notes",
-                  "order": 0,
-                  "score": 0,
-                  "dictionary": "Test Dictionary 2",
-                  "redundant": false
-                },
-                {
-                  "name": "tag4",
-                  "category": "category4",
-                  "notes": "tag4 notes",
+                  "name": "E2",
+                  "category": "default",
+                  "notes": "example tag 2",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
                   "redundant": false
                 },
                 {
-                  "name": "tag5",
-                  "category": "category5",
-                  "notes": "tag5 notes",
+                  "name": "P",
+                  "category": "popular",
+                  "notes": "popular term",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
@@ -5710,23 +5013,14 @@
             }
           ],
           "glossary": [
-            "definition7",
-            "definition8"
+            "utsu definition 3",
+            "utsu definition 4"
           ],
           "definitionTags": [
             {
-              "name": "tag1",
-              "category": "category1",
-              "notes": "tag1 notes",
-              "order": 0,
-              "score": 0,
-              "dictionary": "Test Dictionary 2",
-              "redundant": false
-            },
-            {
-              "name": "tag2",
-              "category": "category2",
-              "notes": "tag2 notes",
+              "name": "vt",
+              "category": "partOfSpeech",
+              "notes": "transitive verb",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -5735,27 +5029,18 @@
           ],
           "termTags": [
             {
-              "name": "tag3",
-              "category": "category3",
-              "notes": "tag3 notes",
-              "order": 0,
-              "score": 0,
-              "dictionary": "Test Dictionary 2",
-              "redundant": false
-            },
-            {
-              "name": "tag4",
-              "category": "category4",
-              "notes": "tag4 notes",
+              "name": "E2",
+              "category": "default",
+              "notes": "example tag 2",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
               "redundant": false
             },
             {
-              "name": "tag5",
-              "category": "category5",
-              "notes": "tag5 notes",
+              "name": "P",
+              "category": "popular",
+              "notes": "popular term",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -5872,27 +5157,18 @@
               "reading": "ぶつ",
               "termTags": [
                 {
-                  "name": "tag3",
-                  "category": "category3",
-                  "notes": "tag3 notes",
-                  "order": 0,
-                  "score": 0,
-                  "dictionary": "Test Dictionary 2",
-                  "redundant": false
-                },
-                {
-                  "name": "tag4",
-                  "category": "category4",
-                  "notes": "tag4 notes",
+                  "name": "E1",
+                  "category": "default",
+                  "notes": "example tag 1",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
                   "redundant": false
                 },
                 {
-                  "name": "tag5",
-                  "category": "category5",
-                  "notes": "tag5 notes",
+                  "name": "P",
+                  "category": "popular",
+                  "notes": "popular term",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
@@ -5945,23 +5221,14 @@
             }
           ],
           "glossary": [
-            "definition9",
-            "definition10"
+            "butsu definition 1",
+            "butsu definition 2"
           ],
           "definitionTags": [
             {
-              "name": "tag1",
-              "category": "category1",
-              "notes": "tag1 notes",
-              "order": 0,
-              "score": 0,
-              "dictionary": "Test Dictionary 2",
-              "redundant": false
-            },
-            {
-              "name": "tag2",
-              "category": "category2",
-              "notes": "tag2 notes",
+              "name": "vt",
+              "category": "partOfSpeech",
+              "notes": "transitive verb",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -5970,27 +5237,18 @@
           ],
           "termTags": [
             {
-              "name": "tag3",
-              "category": "category3",
-              "notes": "tag3 notes",
-              "order": 0,
-              "score": 0,
-              "dictionary": "Test Dictionary 2",
-              "redundant": false
-            },
-            {
-              "name": "tag4",
-              "category": "category4",
-              "notes": "tag4 notes",
+              "name": "E1",
+              "category": "default",
+              "notes": "example tag 1",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
               "redundant": false
             },
             {
-              "name": "tag5",
-              "category": "category5",
-              "notes": "tag5 notes",
+              "name": "P",
+              "category": "popular",
+              "notes": "popular term",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -6102,27 +5360,18 @@
               "reading": "ぶつ",
               "termTags": [
                 {
-                  "name": "tag3",
-                  "category": "category3",
-                  "notes": "tag3 notes",
-                  "order": 0,
-                  "score": 0,
-                  "dictionary": "Test Dictionary 2",
-                  "redundant": false
-                },
-                {
-                  "name": "tag4",
-                  "category": "category4",
-                  "notes": "tag4 notes",
+                  "name": "E2",
+                  "category": "default",
+                  "notes": "example tag 2",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
                   "redundant": false
                 },
                 {
-                  "name": "tag5",
-                  "category": "category5",
-                  "notes": "tag5 notes",
+                  "name": "P",
+                  "category": "popular",
+                  "notes": "popular term",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
@@ -6175,23 +5424,14 @@
             }
           ],
           "glossary": [
-            "definition11",
-            "definition12"
+            "butsu definition 3",
+            "butsu definition 4"
           ],
           "definitionTags": [
             {
-              "name": "tag1",
-              "category": "category1",
-              "notes": "tag1 notes",
-              "order": 0,
-              "score": 0,
-              "dictionary": "Test Dictionary 2",
-              "redundant": false
-            },
-            {
-              "name": "tag2",
-              "category": "category2",
-              "notes": "tag2 notes",
+              "name": "vt",
+              "category": "partOfSpeech",
+              "notes": "transitive verb",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -6200,27 +5440,18 @@
           ],
           "termTags": [
             {
-              "name": "tag3",
-              "category": "category3",
-              "notes": "tag3 notes",
-              "order": 0,
-              "score": 0,
-              "dictionary": "Test Dictionary 2",
-              "redundant": false
-            },
-            {
-              "name": "tag4",
-              "category": "category4",
-              "notes": "tag4 notes",
+              "name": "E2",
+              "category": "default",
+              "notes": "example tag 2",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
               "redundant": false
             },
             {
-              "name": "tag5",
-              "category": "category5",
-              "notes": "tag5 notes",
+              "name": "P",
+              "category": "popular",
+              "notes": "popular term",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -6337,27 +5568,18 @@
               "reading": "うちこむ",
               "termTags": [
                 {
-                  "name": "tag3",
-                  "category": "category3",
-                  "notes": "tag3 notes",
-                  "order": 0,
-                  "score": 0,
-                  "dictionary": "Test Dictionary 2",
-                  "redundant": false
-                },
-                {
-                  "name": "tag4",
-                  "category": "category4",
-                  "notes": "tag4 notes",
+                  "name": "E1",
+                  "category": "default",
+                  "notes": "example tag 1",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
                   "redundant": false
                 },
                 {
-                  "name": "tag5",
-                  "category": "category5",
-                  "notes": "tag5 notes",
+                  "name": "P",
+                  "category": "popular",
+                  "notes": "popular term",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
@@ -6440,23 +5662,14 @@
             }
           ],
           "glossary": [
-            "definition13",
-            "definition14"
+            "uchikomu definition 1",
+            "uchikomu definition 2"
           ],
           "definitionTags": [
             {
-              "name": "tag1",
-              "category": "category1",
-              "notes": "tag1 notes",
-              "order": 0,
-              "score": 0,
-              "dictionary": "Test Dictionary 2",
-              "redundant": false
-            },
-            {
-              "name": "tag2",
-              "category": "category2",
-              "notes": "tag2 notes",
+              "name": "vt",
+              "category": "partOfSpeech",
+              "notes": "transitive verb",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -6465,27 +5678,18 @@
           ],
           "termTags": [
             {
-              "name": "tag3",
-              "category": "category3",
-              "notes": "tag3 notes",
-              "order": 0,
-              "score": 0,
-              "dictionary": "Test Dictionary 2",
-              "redundant": false
-            },
-            {
-              "name": "tag4",
-              "category": "category4",
-              "notes": "tag4 notes",
+              "name": "E1",
+              "category": "default",
+              "notes": "example tag 1",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
               "redundant": false
             },
             {
-              "name": "tag5",
-              "category": "category5",
-              "notes": "tag5 notes",
+              "name": "P",
+              "category": "popular",
+              "notes": "popular term",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -6653,27 +5857,18 @@
               "reading": "うちこむ",
               "termTags": [
                 {
-                  "name": "tag5",
-                  "category": "category5",
-                  "notes": "tag5 notes",
-                  "order": 0,
-                  "score": 0,
-                  "dictionary": "Test Dictionary 2",
-                  "redundant": false
-                },
-                {
-                  "name": "tag6",
+                  "name": "E2",
                   "category": "default",
-                  "notes": "",
+                  "notes": "example tag 2",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
                   "redundant": false
                 },
                 {
-                  "name": "tag7",
-                  "category": "default",
-                  "notes": "",
+                  "name": "P",
+                  "category": "popular",
+                  "notes": "popular term",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
@@ -6756,23 +5951,14 @@
             }
           ],
           "glossary": [
-            "definition15",
-            "definition16"
+            "uchikomu definition 3",
+            "uchikomu definition 4"
           ],
           "definitionTags": [
             {
-              "name": "tag1",
-              "category": "category1",
-              "notes": "tag1 notes",
-              "order": 0,
-              "score": 0,
-              "dictionary": "Test Dictionary 2",
-              "redundant": false
-            },
-            {
-              "name": "tag2",
-              "category": "category2",
-              "notes": "tag2 notes",
+              "name": "vt",
+              "category": "partOfSpeech",
+              "notes": "transitive verb",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -6781,27 +5967,18 @@
           ],
           "termTags": [
             {
-              "name": "tag5",
-              "category": "category5",
-              "notes": "tag5 notes",
-              "order": 0,
-              "score": 0,
-              "dictionary": "Test Dictionary 2",
-              "redundant": false
-            },
-            {
-              "name": "tag6",
+              "name": "E2",
               "category": "default",
-              "notes": "",
+              "notes": "example tag 2",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
               "redundant": false
             },
             {
-              "name": "tag7",
-              "category": "default",
-              "notes": "",
+              "name": "P",
+              "category": "popular",
+              "notes": "popular term",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -6971,27 +6148,18 @@
               "reading": "うつ",
               "termTags": [
                 {
-                  "name": "tag3",
-                  "category": "category3",
-                  "notes": "tag3 notes",
-                  "order": 0,
-                  "score": 0,
-                  "dictionary": "Test Dictionary 2",
-                  "redundant": false
-                },
-                {
-                  "name": "tag4",
-                  "category": "category4",
-                  "notes": "tag4 notes",
+                  "name": "E1",
+                  "category": "default",
+                  "notes": "example tag 1",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
                   "redundant": false
                 },
                 {
-                  "name": "tag5",
-                  "category": "category5",
-                  "notes": "tag5 notes",
+                  "name": "P",
+                  "category": "popular",
+                  "notes": "popular term",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
@@ -7044,23 +6212,14 @@
             }
           ],
           "glossary": [
-            "definition5",
-            "definition6"
+            "utsu definition 1",
+            "utsu definition 2"
           ],
           "definitionTags": [
             {
-              "name": "tag1",
-              "category": "category1",
-              "notes": "tag1 notes",
-              "order": 0,
-              "score": 0,
-              "dictionary": "Test Dictionary 2",
-              "redundant": false
-            },
-            {
-              "name": "tag2",
-              "category": "category2",
-              "notes": "tag2 notes",
+              "name": "vt",
+              "category": "partOfSpeech",
+              "notes": "transitive verb",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -7069,27 +6228,18 @@
           ],
           "termTags": [
             {
-              "name": "tag3",
-              "category": "category3",
-              "notes": "tag3 notes",
-              "order": 0,
-              "score": 0,
-              "dictionary": "Test Dictionary 2",
-              "redundant": false
-            },
-            {
-              "name": "tag4",
-              "category": "category4",
-              "notes": "tag4 notes",
+              "name": "E1",
+              "category": "default",
+              "notes": "example tag 1",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
               "redundant": false
             },
             {
-              "name": "tag5",
-              "category": "category5",
-              "notes": "tag5 notes",
+              "name": "P",
+              "category": "popular",
+              "notes": "popular term",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -7203,27 +6353,18 @@
               "reading": "うつ",
               "termTags": [
                 {
-                  "name": "tag3",
-                  "category": "category3",
-                  "notes": "tag3 notes",
-                  "order": 0,
-                  "score": 0,
-                  "dictionary": "Test Dictionary 2",
-                  "redundant": false
-                },
-                {
-                  "name": "tag4",
-                  "category": "category4",
-                  "notes": "tag4 notes",
+                  "name": "E2",
+                  "category": "default",
+                  "notes": "example tag 2",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
                   "redundant": false
                 },
                 {
-                  "name": "tag5",
-                  "category": "category5",
-                  "notes": "tag5 notes",
+                  "name": "P",
+                  "category": "popular",
+                  "notes": "popular term",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
@@ -7276,23 +6417,14 @@
             }
           ],
           "glossary": [
-            "definition7",
-            "definition8"
+            "utsu definition 3",
+            "utsu definition 4"
           ],
           "definitionTags": [
             {
-              "name": "tag1",
-              "category": "category1",
-              "notes": "tag1 notes",
-              "order": 0,
-              "score": 0,
-              "dictionary": "Test Dictionary 2",
-              "redundant": false
-            },
-            {
-              "name": "tag2",
-              "category": "category2",
-              "notes": "tag2 notes",
+              "name": "vt",
+              "category": "partOfSpeech",
+              "notes": "transitive verb",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -7301,27 +6433,18 @@
           ],
           "termTags": [
             {
-              "name": "tag3",
-              "category": "category3",
-              "notes": "tag3 notes",
-              "order": 0,
-              "score": 0,
-              "dictionary": "Test Dictionary 2",
-              "redundant": false
-            },
-            {
-              "name": "tag4",
-              "category": "category4",
-              "notes": "tag4 notes",
+              "name": "E2",
+              "category": "default",
+              "notes": "example tag 2",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
               "redundant": false
             },
             {
-              "name": "tag5",
-              "category": "category5",
-              "notes": "tag5 notes",
+              "name": "P",
+              "category": "popular",
+              "notes": "popular term",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -7438,27 +6561,18 @@
               "reading": "ぶちこむ",
               "termTags": [
                 {
-                  "name": "tag3",
-                  "category": "category3",
-                  "notes": "tag3 notes",
-                  "order": 0,
-                  "score": 0,
-                  "dictionary": "Test Dictionary 2",
-                  "redundant": false
-                },
-                {
-                  "name": "tag4",
-                  "category": "category4",
-                  "notes": "tag4 notes",
+                  "name": "E1",
+                  "category": "default",
+                  "notes": "example tag 1",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
                   "redundant": false
                 },
                 {
-                  "name": "tag5",
-                  "category": "category5",
-                  "notes": "tag5 notes",
+                  "name": "P",
+                  "category": "popular",
+                  "notes": "popular term",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
@@ -7541,23 +6655,14 @@
             }
           ],
           "glossary": [
-            "definition17",
-            "definition18"
+            "buchikomu definition 1",
+            "buchikomu definition 2"
           ],
           "definitionTags": [
             {
-              "name": "tag1",
-              "category": "category1",
-              "notes": "tag1 notes",
-              "order": 0,
-              "score": 0,
-              "dictionary": "Test Dictionary 2",
-              "redundant": false
-            },
-            {
-              "name": "tag2",
-              "category": "category2",
-              "notes": "tag2 notes",
+              "name": "vt",
+              "category": "partOfSpeech",
+              "notes": "transitive verb",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -7566,27 +6671,18 @@
           ],
           "termTags": [
             {
-              "name": "tag3",
-              "category": "category3",
-              "notes": "tag3 notes",
-              "order": 0,
-              "score": 0,
-              "dictionary": "Test Dictionary 2",
-              "redundant": false
-            },
-            {
-              "name": "tag4",
-              "category": "category4",
-              "notes": "tag4 notes",
+              "name": "E1",
+              "category": "default",
+              "notes": "example tag 1",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
               "redundant": false
             },
             {
-              "name": "tag5",
-              "category": "category5",
-              "notes": "tag5 notes",
+              "name": "P",
+              "category": "popular",
+              "notes": "popular term",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -7754,27 +6850,18 @@
               "reading": "ぶちこむ",
               "termTags": [
                 {
-                  "name": "tag3",
-                  "category": "category3",
-                  "notes": "tag3 notes",
-                  "order": 0,
-                  "score": 0,
-                  "dictionary": "Test Dictionary 2",
-                  "redundant": false
-                },
-                {
-                  "name": "tag4",
-                  "category": "category4",
-                  "notes": "tag4 notes",
+                  "name": "E2",
+                  "category": "default",
+                  "notes": "example tag 2",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
                   "redundant": false
                 },
                 {
-                  "name": "tag5",
-                  "category": "category5",
-                  "notes": "tag5 notes",
+                  "name": "P",
+                  "category": "popular",
+                  "notes": "popular term",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
@@ -7857,23 +6944,14 @@
             }
           ],
           "glossary": [
-            "definition19",
-            "definition20"
+            "buchikomu definition 3",
+            "buchikomu definition 4"
           ],
           "definitionTags": [
             {
-              "name": "tag1",
-              "category": "category1",
-              "notes": "tag1 notes",
-              "order": 0,
-              "score": 0,
-              "dictionary": "Test Dictionary 2",
-              "redundant": false
-            },
-            {
-              "name": "tag2",
-              "category": "category2",
-              "notes": "tag2 notes",
+              "name": "vt",
+              "category": "partOfSpeech",
+              "notes": "transitive verb",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -7882,27 +6960,18 @@
           ],
           "termTags": [
             {
-              "name": "tag3",
-              "category": "category3",
-              "notes": "tag3 notes",
-              "order": 0,
-              "score": 0,
-              "dictionary": "Test Dictionary 2",
-              "redundant": false
-            },
-            {
-              "name": "tag4",
-              "category": "category4",
-              "notes": "tag4 notes",
+              "name": "E2",
+              "category": "default",
+              "notes": "example tag 2",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
               "redundant": false
             },
             {
-              "name": "tag5",
-              "category": "category5",
-              "notes": "tag5 notes",
+              "name": "P",
+              "category": "popular",
+              "notes": "popular term",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -8072,27 +7141,18 @@
               "reading": "ぶつ",
               "termTags": [
                 {
-                  "name": "tag3",
-                  "category": "category3",
-                  "notes": "tag3 notes",
-                  "order": 0,
-                  "score": 0,
-                  "dictionary": "Test Dictionary 2",
-                  "redundant": false
-                },
-                {
-                  "name": "tag4",
-                  "category": "category4",
-                  "notes": "tag4 notes",
+                  "name": "E1",
+                  "category": "default",
+                  "notes": "example tag 1",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
                   "redundant": false
                 },
                 {
-                  "name": "tag5",
-                  "category": "category5",
-                  "notes": "tag5 notes",
+                  "name": "P",
+                  "category": "popular",
+                  "notes": "popular term",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
@@ -8145,23 +7205,14 @@
             }
           ],
           "glossary": [
-            "definition9",
-            "definition10"
+            "butsu definition 1",
+            "butsu definition 2"
           ],
           "definitionTags": [
             {
-              "name": "tag1",
-              "category": "category1",
-              "notes": "tag1 notes",
-              "order": 0,
-              "score": 0,
-              "dictionary": "Test Dictionary 2",
-              "redundant": false
-            },
-            {
-              "name": "tag2",
-              "category": "category2",
-              "notes": "tag2 notes",
+              "name": "vt",
+              "category": "partOfSpeech",
+              "notes": "transitive verb",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -8170,27 +7221,18 @@
           ],
           "termTags": [
             {
-              "name": "tag3",
-              "category": "category3",
-              "notes": "tag3 notes",
-              "order": 0,
-              "score": 0,
-              "dictionary": "Test Dictionary 2",
-              "redundant": false
-            },
-            {
-              "name": "tag4",
-              "category": "category4",
-              "notes": "tag4 notes",
+              "name": "E1",
+              "category": "default",
+              "notes": "example tag 1",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
               "redundant": false
             },
             {
-              "name": "tag5",
-              "category": "category5",
-              "notes": "tag5 notes",
+              "name": "P",
+              "category": "popular",
+              "notes": "popular term",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -8304,27 +7346,18 @@
               "reading": "ぶつ",
               "termTags": [
                 {
-                  "name": "tag3",
-                  "category": "category3",
-                  "notes": "tag3 notes",
-                  "order": 0,
-                  "score": 0,
-                  "dictionary": "Test Dictionary 2",
-                  "redundant": false
-                },
-                {
-                  "name": "tag4",
-                  "category": "category4",
-                  "notes": "tag4 notes",
+                  "name": "E2",
+                  "category": "default",
+                  "notes": "example tag 2",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
                   "redundant": false
                 },
                 {
-                  "name": "tag5",
-                  "category": "category5",
-                  "notes": "tag5 notes",
+                  "name": "P",
+                  "category": "popular",
+                  "notes": "popular term",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
@@ -8377,23 +7410,14 @@
             }
           ],
           "glossary": [
-            "definition11",
-            "definition12"
+            "butsu definition 3",
+            "butsu definition 4"
           ],
           "definitionTags": [
             {
-              "name": "tag1",
-              "category": "category1",
-              "notes": "tag1 notes",
-              "order": 0,
-              "score": 0,
-              "dictionary": "Test Dictionary 2",
-              "redundant": false
-            },
-            {
-              "name": "tag2",
-              "category": "category2",
-              "notes": "tag2 notes",
+              "name": "vt",
+              "category": "partOfSpeech",
+              "notes": "transitive verb",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -8402,27 +7426,18 @@
           ],
           "termTags": [
             {
-              "name": "tag3",
-              "category": "category3",
-              "notes": "tag3 notes",
-              "order": 0,
-              "score": 0,
-              "dictionary": "Test Dictionary 2",
-              "redundant": false
-            },
-            {
-              "name": "tag4",
-              "category": "category4",
-              "notes": "tag4 notes",
+              "name": "E2",
+              "category": "default",
+              "notes": "example tag 2",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
               "redundant": false
             },
             {
-              "name": "tag5",
-              "category": "category5",
-              "notes": "tag5 notes",
+              "name": "P",
+              "category": "popular",
+              "notes": "popular term",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -8539,27 +7554,18 @@
               "reading": "がぞう",
               "termTags": [
                 {
-                  "name": "tag3",
-                  "category": "category3",
-                  "notes": "tag3 notes",
-                  "order": 0,
-                  "score": 0,
-                  "dictionary": "Test Dictionary 2",
-                  "redundant": false
-                },
-                {
-                  "name": "tag4",
-                  "category": "category4",
-                  "notes": "tag4 notes",
+                  "name": "E1",
+                  "category": "default",
+                  "notes": "example tag 1",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
                   "redundant": false
                 },
                 {
-                  "name": "tag5",
-                  "category": "category5",
-                  "notes": "tag5 notes",
+                  "name": "P",
+                  "category": "popular",
+                  "notes": "popular term",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
@@ -8575,11 +7581,13 @@
                 }
               ],
               "termFrequency": "normal",
-              "wordClasses": []
+              "wordClasses": [
+                "n"
+              ]
             }
           ],
           "glossary": [
-            "definition21",
+            "gazou definition 1",
             {
               "type": "image",
               "path": "image.gif",
@@ -8587,24 +7595,15 @@
               "height": 100,
               "preferredWidth": 350,
               "preferredHeight": 350,
-              "description": "An image",
+              "description": "gazou definition 2",
               "pixelated": true
             }
           ],
           "definitionTags": [
             {
-              "name": "tag1",
-              "category": "category1",
-              "notes": "tag1 notes",
-              "order": 0,
-              "score": 0,
-              "dictionary": "Test Dictionary 2",
-              "redundant": false
-            },
-            {
-              "name": "tag2",
-              "category": "category2",
-              "notes": "tag2 notes",
+              "name": "n",
+              "category": "partOfSpeech",
+              "notes": "noun",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -8613,27 +7612,18 @@
           ],
           "termTags": [
             {
-              "name": "tag3",
-              "category": "category3",
-              "notes": "tag3 notes",
-              "order": 0,
-              "score": 0,
-              "dictionary": "Test Dictionary 2",
-              "redundant": false
-            },
-            {
-              "name": "tag4",
-              "category": "category4",
-              "notes": "tag4 notes",
+              "name": "E1",
+              "category": "default",
+              "notes": "example tag 1",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
               "redundant": false
             },
             {
-              "name": "tag5",
-              "category": "category5",
-              "notes": "tag5 notes",
+              "name": "P",
+              "category": "popular",
+              "notes": "popular term",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -8729,45 +7719,27 @@
               "reading": "うちこむ",
               "termTags": [
                 {
-                  "name": "tag3",
-                  "category": "category3",
-                  "notes": "tag3 notes",
-                  "order": 0,
-                  "score": 0,
-                  "dictionary": "Test Dictionary 2",
-                  "redundant": false
-                },
-                {
-                  "name": "tag4",
-                  "category": "category4",
-                  "notes": "tag4 notes",
-                  "order": 0,
-                  "score": 0,
-                  "dictionary": "Test Dictionary 2",
-                  "redundant": false
-                },
-                {
-                  "name": "tag5",
-                  "category": "category5",
-                  "notes": "tag5 notes",
+                  "name": "E1",
+                  "category": "default",
+                  "notes": "example tag 1",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
                   "redundant": false
                 },
                 {
-                  "name": "tag6",
+                  "name": "E2",
                   "category": "default",
-                  "notes": "",
+                  "notes": "example tag 2",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
                   "redundant": false
                 },
                 {
-                  "name": "tag7",
-                  "category": "default",
-                  "notes": "",
+                  "name": "P",
+                  "category": "popular",
+                  "notes": "popular term",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
@@ -8851,45 +7823,27 @@
           ],
           "termTags": [
             {
-              "name": "tag3",
-              "category": "category3",
-              "notes": "tag3 notes",
-              "order": 0,
-              "score": 0,
-              "dictionary": "Test Dictionary 2",
-              "redundant": false
-            },
-            {
-              "name": "tag4",
-              "category": "category4",
-              "notes": "tag4 notes",
-              "order": 0,
-              "score": 0,
-              "dictionary": "Test Dictionary 2",
-              "redundant": false
-            },
-            {
-              "name": "tag5",
-              "category": "category5",
-              "notes": "tag5 notes",
+              "name": "E1",
+              "category": "default",
+              "notes": "example tag 1",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
               "redundant": false
             },
             {
-              "name": "tag6",
+              "name": "E2",
               "category": "default",
-              "notes": "",
+              "notes": "example tag 2",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
               "redundant": false
             },
             {
-              "name": "tag7",
-              "category": "default",
-              "notes": "",
+              "name": "P",
+              "category": "popular",
+              "notes": "popular term",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -8901,23 +7855,14 @@
               "sequence": 4,
               "dictionary": "Test Dictionary 2",
               "glossary": [
-                "definition13",
-                "definition14"
+                "uchikomu definition 1",
+                "uchikomu definition 2"
               ],
               "definitionTags": [
                 {
-                  "name": "tag1",
-                  "category": "category1",
-                  "notes": "tag1 notes",
-                  "order": 0,
-                  "score": 0,
-                  "dictionary": "Test Dictionary 2",
-                  "redundant": false
-                },
-                {
-                  "name": "tag2",
-                  "category": "category2",
-                  "notes": "tag2 notes",
+                  "name": "vt",
+                  "category": "partOfSpeech",
+                  "notes": "transitive verb",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
@@ -8929,27 +7874,18 @@
               "sequence": 4,
               "dictionary": "Test Dictionary 2",
               "glossary": [
-                "definition15",
-                "definition16"
+                "uchikomu definition 3",
+                "uchikomu definition 4"
               ],
               "definitionTags": [
                 {
-                  "name": "tag1",
-                  "category": "category1",
-                  "notes": "tag1 notes",
-                  "order": 0,
-                  "score": 0,
-                  "dictionary": "Test Dictionary 2",
-                  "redundant": false
-                },
-                {
-                  "name": "tag2",
-                  "category": "category2",
-                  "notes": "tag2 notes",
+                  "name": "vt",
+                  "category": "partOfSpeech",
+                  "notes": "transitive verb",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
-                  "redundant": false
+                  "redundant": true
                 }
               ]
             }
@@ -9095,27 +8031,27 @@
               "reading": "ぶちこむ",
               "termTags": [
                 {
-                  "name": "tag3",
-                  "category": "category3",
-                  "notes": "tag3 notes",
+                  "name": "E1",
+                  "category": "default",
+                  "notes": "example tag 1",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
                   "redundant": false
                 },
                 {
-                  "name": "tag4",
-                  "category": "category4",
-                  "notes": "tag4 notes",
+                  "name": "E2",
+                  "category": "default",
+                  "notes": "example tag 2",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
                   "redundant": false
                 },
                 {
-                  "name": "tag5",
-                  "category": "category5",
-                  "notes": "tag5 notes",
+                  "name": "P",
+                  "category": "popular",
+                  "notes": "popular term",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
@@ -9199,27 +8135,27 @@
           ],
           "termTags": [
             {
-              "name": "tag3",
-              "category": "category3",
-              "notes": "tag3 notes",
+              "name": "E1",
+              "category": "default",
+              "notes": "example tag 1",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
               "redundant": false
             },
             {
-              "name": "tag4",
-              "category": "category4",
-              "notes": "tag4 notes",
+              "name": "E2",
+              "category": "default",
+              "notes": "example tag 2",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
               "redundant": false
             },
             {
-              "name": "tag5",
-              "category": "category5",
-              "notes": "tag5 notes",
+              "name": "P",
+              "category": "popular",
+              "notes": "popular term",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -9231,23 +8167,14 @@
               "sequence": 4,
               "dictionary": "Test Dictionary 2",
               "glossary": [
-                "definition17",
-                "definition18"
+                "buchikomu definition 1",
+                "buchikomu definition 2"
               ],
               "definitionTags": [
                 {
-                  "name": "tag1",
-                  "category": "category1",
-                  "notes": "tag1 notes",
-                  "order": 0,
-                  "score": 0,
-                  "dictionary": "Test Dictionary 2",
-                  "redundant": false
-                },
-                {
-                  "name": "tag2",
-                  "category": "category2",
-                  "notes": "tag2 notes",
+                  "name": "vt",
+                  "category": "partOfSpeech",
+                  "notes": "transitive verb",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
@@ -9259,27 +8186,18 @@
               "sequence": 4,
               "dictionary": "Test Dictionary 2",
               "glossary": [
-                "definition19",
-                "definition20"
+                "buchikomu definition 3",
+                "buchikomu definition 4"
               ],
               "definitionTags": [
                 {
-                  "name": "tag1",
-                  "category": "category1",
-                  "notes": "tag1 notes",
-                  "order": 0,
-                  "score": 0,
-                  "dictionary": "Test Dictionary 2",
-                  "redundant": false
-                },
-                {
-                  "name": "tag2",
-                  "category": "category2",
-                  "notes": "tag2 notes",
+                  "name": "vt",
+                  "category": "partOfSpeech",
+                  "notes": "transitive verb",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
-                  "redundant": false
+                  "redundant": true
                 }
               ]
             }
@@ -9427,27 +8345,27 @@
               "reading": "うつ",
               "termTags": [
                 {
-                  "name": "tag3",
-                  "category": "category3",
-                  "notes": "tag3 notes",
+                  "name": "E1",
+                  "category": "default",
+                  "notes": "example tag 1",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
                   "redundant": false
                 },
                 {
-                  "name": "tag4",
-                  "category": "category4",
-                  "notes": "tag4 notes",
+                  "name": "E2",
+                  "category": "default",
+                  "notes": "example tag 2",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
                   "redundant": false
                 },
                 {
-                  "name": "tag5",
-                  "category": "category5",
-                  "notes": "tag5 notes",
+                  "name": "P",
+                  "category": "popular",
+                  "notes": "popular term",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
@@ -9501,27 +8419,27 @@
           ],
           "termTags": [
             {
-              "name": "tag3",
-              "category": "category3",
-              "notes": "tag3 notes",
+              "name": "E1",
+              "category": "default",
+              "notes": "example tag 1",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
               "redundant": false
             },
             {
-              "name": "tag4",
-              "category": "category4",
-              "notes": "tag4 notes",
+              "name": "E2",
+              "category": "default",
+              "notes": "example tag 2",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
               "redundant": false
             },
             {
-              "name": "tag5",
-              "category": "category5",
-              "notes": "tag5 notes",
+              "name": "P",
+              "category": "popular",
+              "notes": "popular term",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -9533,23 +8451,14 @@
               "sequence": 3,
               "dictionary": "Test Dictionary 2",
               "glossary": [
-                "definition5",
-                "definition6"
+                "utsu definition 1",
+                "utsu definition 2"
               ],
               "definitionTags": [
                 {
-                  "name": "tag1",
-                  "category": "category1",
-                  "notes": "tag1 notes",
-                  "order": 0,
-                  "score": 0,
-                  "dictionary": "Test Dictionary 2",
-                  "redundant": false
-                },
-                {
-                  "name": "tag2",
-                  "category": "category2",
-                  "notes": "tag2 notes",
+                  "name": "vt",
+                  "category": "partOfSpeech",
+                  "notes": "transitive verb",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
@@ -9561,27 +8470,18 @@
               "sequence": 3,
               "dictionary": "Test Dictionary 2",
               "glossary": [
-                "definition7",
-                "definition8"
+                "utsu definition 3",
+                "utsu definition 4"
               ],
               "definitionTags": [
                 {
-                  "name": "tag1",
-                  "category": "category1",
-                  "notes": "tag1 notes",
-                  "order": 0,
-                  "score": 0,
-                  "dictionary": "Test Dictionary 2",
-                  "redundant": false
-                },
-                {
-                  "name": "tag2",
-                  "category": "category2",
-                  "notes": "tag2 notes",
+                  "name": "vt",
+                  "category": "partOfSpeech",
+                  "notes": "transitive verb",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
-                  "redundant": false
+                  "redundant": true
                 }
               ]
             }
@@ -9681,27 +8581,27 @@
               "reading": "ぶつ",
               "termTags": [
                 {
-                  "name": "tag3",
-                  "category": "category3",
-                  "notes": "tag3 notes",
+                  "name": "E1",
+                  "category": "default",
+                  "notes": "example tag 1",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
                   "redundant": false
                 },
                 {
-                  "name": "tag4",
-                  "category": "category4",
-                  "notes": "tag4 notes",
+                  "name": "E2",
+                  "category": "default",
+                  "notes": "example tag 2",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
                   "redundant": false
                 },
                 {
-                  "name": "tag5",
-                  "category": "category5",
-                  "notes": "tag5 notes",
+                  "name": "P",
+                  "category": "popular",
+                  "notes": "popular term",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
@@ -9755,27 +8655,27 @@
           ],
           "termTags": [
             {
-              "name": "tag3",
-              "category": "category3",
-              "notes": "tag3 notes",
+              "name": "E1",
+              "category": "default",
+              "notes": "example tag 1",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
               "redundant": false
             },
             {
-              "name": "tag4",
-              "category": "category4",
-              "notes": "tag4 notes",
+              "name": "E2",
+              "category": "default",
+              "notes": "example tag 2",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
               "redundant": false
             },
             {
-              "name": "tag5",
-              "category": "category5",
-              "notes": "tag5 notes",
+              "name": "P",
+              "category": "popular",
+              "notes": "popular term",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -9787,23 +8687,14 @@
               "sequence": 3,
               "dictionary": "Test Dictionary 2",
               "glossary": [
-                "definition9",
-                "definition10"
+                "butsu definition 1",
+                "butsu definition 2"
               ],
               "definitionTags": [
                 {
-                  "name": "tag1",
-                  "category": "category1",
-                  "notes": "tag1 notes",
-                  "order": 0,
-                  "score": 0,
-                  "dictionary": "Test Dictionary 2",
-                  "redundant": false
-                },
-                {
-                  "name": "tag2",
-                  "category": "category2",
-                  "notes": "tag2 notes",
+                  "name": "vt",
+                  "category": "partOfSpeech",
+                  "notes": "transitive verb",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
@@ -9815,27 +8706,18 @@
               "sequence": 3,
               "dictionary": "Test Dictionary 2",
               "glossary": [
-                "definition11",
-                "definition12"
+                "butsu definition 3",
+                "butsu definition 4"
               ],
               "definitionTags": [
                 {
-                  "name": "tag1",
-                  "category": "category1",
-                  "notes": "tag1 notes",
-                  "order": 0,
-                  "score": 0,
-                  "dictionary": "Test Dictionary 2",
-                  "redundant": false
-                },
-                {
-                  "name": "tag2",
-                  "category": "category2",
-                  "notes": "tag2 notes",
+                  "name": "vt",
+                  "category": "partOfSpeech",
+                  "notes": "transitive verb",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
-                  "redundant": false
+                  "redundant": true
                 }
               ]
             }
@@ -9933,27 +8815,9 @@
               "reading": "だ",
               "termTags": [
                 {
-                  "name": "tag3",
-                  "category": "category3",
-                  "notes": "tag3 notes",
-                  "order": 0,
-                  "score": 0,
-                  "dictionary": "Test Dictionary 2",
-                  "redundant": false
-                },
-                {
-                  "name": "tag4",
-                  "category": "category4",
-                  "notes": "tag4 notes",
-                  "order": 0,
-                  "score": 0,
-                  "dictionary": "Test Dictionary 2",
-                  "redundant": false
-                },
-                {
-                  "name": "tag5",
-                  "category": "category5",
-                  "notes": "tag5 notes",
+                  "name": "E1",
+                  "category": "default",
+                  "notes": "example tag 1",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
@@ -9996,32 +8860,16 @@
                 }
               ],
               "termFrequency": "normal",
-              "wordClasses": []
+              "wordClasses": [
+                "n"
+              ]
             }
           ],
           "termTags": [
             {
-              "name": "tag3",
-              "category": "category3",
-              "notes": "tag3 notes",
-              "order": 0,
-              "score": 0,
-              "dictionary": "Test Dictionary 2",
-              "redundant": false
-            },
-            {
-              "name": "tag4",
-              "category": "category4",
-              "notes": "tag4 notes",
-              "order": 0,
-              "score": 0,
-              "dictionary": "Test Dictionary 2",
-              "redundant": false
-            },
-            {
-              "name": "tag5",
-              "category": "category5",
-              "notes": "tag5 notes",
+              "name": "E1",
+              "category": "default",
+              "notes": "example tag 1",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -10033,23 +8881,14 @@
               "sequence": 1,
               "dictionary": "Test Dictionary 2",
               "glossary": [
-                "definition1",
-                "definition2"
+                "da definition 1",
+                "da definition 2"
               ],
               "definitionTags": [
                 {
-                  "name": "tag1",
-                  "category": "category1",
-                  "notes": "tag1 notes",
-                  "order": 0,
-                  "score": 0,
-                  "dictionary": "Test Dictionary 2",
-                  "redundant": false
-                },
-                {
-                  "name": "tag2",
-                  "category": "category2",
-                  "notes": "tag2 notes",
+                  "name": "n",
+                  "category": "partOfSpeech",
+                  "notes": "noun",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
@@ -10151,27 +8990,9 @@
               "reading": "ダース",
               "termTags": [
                 {
-                  "name": "tag3",
-                  "category": "category3",
-                  "notes": "tag3 notes",
-                  "order": 0,
-                  "score": 0,
-                  "dictionary": "Test Dictionary 2",
-                  "redundant": false
-                },
-                {
-                  "name": "tag4",
-                  "category": "category4",
-                  "notes": "tag4 notes",
-                  "order": 0,
-                  "score": 0,
-                  "dictionary": "Test Dictionary 2",
-                  "redundant": false
-                },
-                {
-                  "name": "tag5",
-                  "category": "category5",
-                  "notes": "tag5 notes",
+                  "name": "E1",
+                  "category": "default",
+                  "notes": "example tag 1",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
@@ -10214,32 +9035,16 @@
                 }
               ],
               "termFrequency": "normal",
-              "wordClasses": []
+              "wordClasses": [
+                "n"
+              ]
             }
           ],
           "termTags": [
             {
-              "name": "tag3",
-              "category": "category3",
-              "notes": "tag3 notes",
-              "order": 0,
-              "score": 0,
-              "dictionary": "Test Dictionary 2",
-              "redundant": false
-            },
-            {
-              "name": "tag4",
-              "category": "category4",
-              "notes": "tag4 notes",
-              "order": 0,
-              "score": 0,
-              "dictionary": "Test Dictionary 2",
-              "redundant": false
-            },
-            {
-              "name": "tag5",
-              "category": "category5",
-              "notes": "tag5 notes",
+              "name": "E1",
+              "category": "default",
+              "notes": "example tag 1",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -10251,23 +9056,23 @@
               "sequence": 2,
               "dictionary": "Test Dictionary 2",
               "glossary": [
-                "definition3",
-                "definition4"
+                "daasu definition 1",
+                "daasu definition 2"
               ],
               "definitionTags": [
                 {
-                  "name": "tag1",
-                  "category": "category1",
-                  "notes": "tag1 notes",
+                  "name": "abbr",
+                  "category": "default",
+                  "notes": "abbreviation",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
                   "redundant": false
                 },
                 {
-                  "name": "tag2",
-                  "category": "category2",
-                  "notes": "tag2 notes",
+                  "name": "n",
+                  "category": "partOfSpeech",
+                  "notes": "noun",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
@@ -10378,45 +9183,27 @@
               "reading": "うちこむ",
               "termTags": [
                 {
-                  "name": "tag3",
-                  "category": "category3",
-                  "notes": "tag3 notes",
-                  "order": 0,
-                  "score": 0,
-                  "dictionary": "Test Dictionary 2",
-                  "redundant": false
-                },
-                {
-                  "name": "tag4",
-                  "category": "category4",
-                  "notes": "tag4 notes",
-                  "order": 0,
-                  "score": 0,
-                  "dictionary": "Test Dictionary 2",
-                  "redundant": false
-                },
-                {
-                  "name": "tag5",
-                  "category": "category5",
-                  "notes": "tag5 notes",
+                  "name": "E1",
+                  "category": "default",
+                  "notes": "example tag 1",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
                   "redundant": false
                 },
                 {
-                  "name": "tag6",
+                  "name": "E2",
                   "category": "default",
-                  "notes": "",
+                  "notes": "example tag 2",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
                   "redundant": false
                 },
                 {
-                  "name": "tag7",
-                  "category": "default",
-                  "notes": "",
+                  "name": "P",
+                  "category": "popular",
+                  "notes": "popular term",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
@@ -10503,27 +9290,27 @@
               "reading": "ぶちこむ",
               "termTags": [
                 {
-                  "name": "tag3",
-                  "category": "category3",
-                  "notes": "tag3 notes",
+                  "name": "E1",
+                  "category": "default",
+                  "notes": "example tag 1",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
                   "redundant": false
                 },
                 {
-                  "name": "tag4",
-                  "category": "category4",
-                  "notes": "tag4 notes",
+                  "name": "E2",
+                  "category": "default",
+                  "notes": "example tag 2",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
                   "redundant": false
                 },
                 {
-                  "name": "tag5",
-                  "category": "category5",
-                  "notes": "tag5 notes",
+                  "name": "P",
+                  "category": "popular",
+                  "notes": "popular term",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
@@ -10610,23 +9397,14 @@
               "sequence": 4,
               "dictionary": "Test Dictionary 2",
               "glossary": [
-                "definition13",
-                "definition14"
+                "uchikomu definition 1",
+                "uchikomu definition 2"
               ],
               "definitionTags": [
                 {
-                  "name": "tag1",
-                  "category": "category1",
-                  "notes": "tag1 notes",
-                  "order": 0,
-                  "score": 0,
-                  "dictionary": "Test Dictionary 2",
-                  "redundant": false
-                },
-                {
-                  "name": "tag2",
-                  "category": "category2",
-                  "notes": "tag2 notes",
+                  "name": "vt",
+                  "category": "partOfSpeech",
+                  "notes": "transitive verb",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
@@ -10641,27 +9419,18 @@
               "sequence": 4,
               "dictionary": "Test Dictionary 2",
               "glossary": [
-                "definition17",
-                "definition18"
+                "buchikomu definition 1",
+                "buchikomu definition 2"
               ],
               "definitionTags": [
                 {
-                  "name": "tag1",
-                  "category": "category1",
-                  "notes": "tag1 notes",
-                  "order": 0,
-                  "score": 0,
-                  "dictionary": "Test Dictionary 2",
-                  "redundant": false
-                },
-                {
-                  "name": "tag2",
-                  "category": "category2",
-                  "notes": "tag2 notes",
+                  "name": "vt",
+                  "category": "partOfSpeech",
+                  "notes": "transitive verb",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
-                  "redundant": false
+                  "redundant": true
                 }
               ],
               "only": [
@@ -10672,27 +9441,18 @@
               "sequence": 4,
               "dictionary": "Test Dictionary 2",
               "glossary": [
-                "definition15",
-                "definition16"
+                "uchikomu definition 3",
+                "uchikomu definition 4"
               ],
               "definitionTags": [
                 {
-                  "name": "tag1",
-                  "category": "category1",
-                  "notes": "tag1 notes",
-                  "order": 0,
-                  "score": 0,
-                  "dictionary": "Test Dictionary 2",
-                  "redundant": false
-                },
-                {
-                  "name": "tag2",
-                  "category": "category2",
-                  "notes": "tag2 notes",
+                  "name": "vt",
+                  "category": "partOfSpeech",
+                  "notes": "transitive verb",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
-                  "redundant": false
+                  "redundant": true
                 }
               ],
               "only": [
@@ -10703,27 +9463,18 @@
               "sequence": 4,
               "dictionary": "Test Dictionary 2",
               "glossary": [
-                "definition19",
-                "definition20"
+                "buchikomu definition 3",
+                "buchikomu definition 4"
               ],
               "definitionTags": [
                 {
-                  "name": "tag1",
-                  "category": "category1",
-                  "notes": "tag1 notes",
-                  "order": 0,
-                  "score": 0,
-                  "dictionary": "Test Dictionary 2",
-                  "redundant": false
-                },
-                {
-                  "name": "tag2",
-                  "category": "category2",
-                  "notes": "tag2 notes",
+                  "name": "vt",
+                  "category": "partOfSpeech",
+                  "notes": "transitive verb",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
-                  "redundant": false
+                  "redundant": true
                 }
               ],
               "only": [
@@ -10954,27 +9705,27 @@
               "reading": "うつ",
               "termTags": [
                 {
-                  "name": "tag3",
-                  "category": "category3",
-                  "notes": "tag3 notes",
+                  "name": "E1",
+                  "category": "default",
+                  "notes": "example tag 1",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
                   "redundant": false
                 },
                 {
-                  "name": "tag4",
-                  "category": "category4",
-                  "notes": "tag4 notes",
+                  "name": "E2",
+                  "category": "default",
+                  "notes": "example tag 2",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
                   "redundant": false
                 },
                 {
-                  "name": "tag5",
-                  "category": "category5",
-                  "notes": "tag5 notes",
+                  "name": "P",
+                  "category": "popular",
+                  "notes": "popular term",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
@@ -11031,27 +9782,27 @@
               "reading": "ぶつ",
               "termTags": [
                 {
-                  "name": "tag3",
-                  "category": "category3",
-                  "notes": "tag3 notes",
+                  "name": "E1",
+                  "category": "default",
+                  "notes": "example tag 1",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
                   "redundant": false
                 },
                 {
-                  "name": "tag4",
-                  "category": "category4",
-                  "notes": "tag4 notes",
+                  "name": "E2",
+                  "category": "default",
+                  "notes": "example tag 2",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
                   "redundant": false
                 },
                 {
-                  "name": "tag5",
-                  "category": "category5",
-                  "notes": "tag5 notes",
+                  "name": "P",
+                  "category": "popular",
+                  "notes": "popular term",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
@@ -11108,23 +9859,14 @@
               "sequence": 3,
               "dictionary": "Test Dictionary 2",
               "glossary": [
-                "definition5",
-                "definition6"
+                "utsu definition 1",
+                "utsu definition 2"
               ],
               "definitionTags": [
                 {
-                  "name": "tag1",
-                  "category": "category1",
-                  "notes": "tag1 notes",
-                  "order": 0,
-                  "score": 0,
-                  "dictionary": "Test Dictionary 2",
-                  "redundant": false
-                },
-                {
-                  "name": "tag2",
-                  "category": "category2",
-                  "notes": "tag2 notes",
+                  "name": "vt",
+                  "category": "partOfSpeech",
+                  "notes": "transitive verb",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
@@ -11139,27 +9881,18 @@
               "sequence": 3,
               "dictionary": "Test Dictionary 2",
               "glossary": [
-                "definition9",
-                "definition10"
+                "butsu definition 1",
+                "butsu definition 2"
               ],
               "definitionTags": [
                 {
-                  "name": "tag1",
-                  "category": "category1",
-                  "notes": "tag1 notes",
-                  "order": 0,
-                  "score": 0,
-                  "dictionary": "Test Dictionary 2",
-                  "redundant": false
-                },
-                {
-                  "name": "tag2",
-                  "category": "category2",
-                  "notes": "tag2 notes",
+                  "name": "vt",
+                  "category": "partOfSpeech",
+                  "notes": "transitive verb",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
-                  "redundant": false
+                  "redundant": true
                 }
               ],
               "only": [
@@ -11170,27 +9903,18 @@
               "sequence": 3,
               "dictionary": "Test Dictionary 2",
               "glossary": [
-                "definition7",
-                "definition8"
+                "utsu definition 3",
+                "utsu definition 4"
               ],
               "definitionTags": [
                 {
-                  "name": "tag1",
-                  "category": "category1",
-                  "notes": "tag1 notes",
-                  "order": 0,
-                  "score": 0,
-                  "dictionary": "Test Dictionary 2",
-                  "redundant": false
-                },
-                {
-                  "name": "tag2",
-                  "category": "category2",
-                  "notes": "tag2 notes",
+                  "name": "vt",
+                  "category": "partOfSpeech",
+                  "notes": "transitive verb",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
-                  "redundant": false
+                  "redundant": true
                 }
               ],
               "only": [
@@ -11201,27 +9925,18 @@
               "sequence": 3,
               "dictionary": "Test Dictionary 2",
               "glossary": [
-                "definition11",
-                "definition12"
+                "butsu definition 3",
+                "butsu definition 4"
               ],
               "definitionTags": [
                 {
-                  "name": "tag1",
-                  "category": "category1",
-                  "notes": "tag1 notes",
-                  "order": 0,
-                  "score": 0,
-                  "dictionary": "Test Dictionary 2",
-                  "redundant": false
-                },
-                {
-                  "name": "tag2",
-                  "category": "category2",
-                  "notes": "tag2 notes",
+                  "name": "vt",
+                  "category": "partOfSpeech",
+                  "notes": "transitive verb",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
-                  "redundant": false
+                  "redundant": true
                 }
               ],
               "only": [
@@ -11352,27 +10067,9 @@
               "reading": "だ",
               "termTags": [
                 {
-                  "name": "tag3",
-                  "category": "category3",
-                  "notes": "tag3 notes",
-                  "order": 0,
-                  "score": 0,
-                  "dictionary": "Test Dictionary 2",
-                  "redundant": false
-                },
-                {
-                  "name": "tag4",
-                  "category": "category4",
-                  "notes": "tag4 notes",
-                  "order": 0,
-                  "score": 0,
-                  "dictionary": "Test Dictionary 2",
-                  "redundant": false
-                },
-                {
-                  "name": "tag5",
-                  "category": "category5",
-                  "notes": "tag5 notes",
+                  "name": "E1",
+                  "category": "default",
+                  "notes": "example tag 1",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
@@ -11415,7 +10112,9 @@
                 }
               ],
               "termFrequency": "normal",
-              "wordClasses": []
+              "wordClasses": [
+                "n"
+              ]
             }
           ],
           "definitions": [
@@ -11423,23 +10122,14 @@
               "sequence": 1,
               "dictionary": "Test Dictionary 2",
               "glossary": [
-                "definition1",
-                "definition2"
+                "da definition 1",
+                "da definition 2"
               ],
               "definitionTags": [
                 {
-                  "name": "tag1",
-                  "category": "category1",
-                  "notes": "tag1 notes",
-                  "order": 0,
-                  "score": 0,
-                  "dictionary": "Test Dictionary 2",
-                  "redundant": false
-                },
-                {
-                  "name": "tag2",
-                  "category": "category2",
-                  "notes": "tag2 notes",
+                  "name": "n",
+                  "category": "partOfSpeech",
+                  "notes": "noun",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
@@ -11545,27 +10235,9 @@
               "reading": "ダース",
               "termTags": [
                 {
-                  "name": "tag3",
-                  "category": "category3",
-                  "notes": "tag3 notes",
-                  "order": 0,
-                  "score": 0,
-                  "dictionary": "Test Dictionary 2",
-                  "redundant": false
-                },
-                {
-                  "name": "tag4",
-                  "category": "category4",
-                  "notes": "tag4 notes",
-                  "order": 0,
-                  "score": 0,
-                  "dictionary": "Test Dictionary 2",
-                  "redundant": false
-                },
-                {
-                  "name": "tag5",
-                  "category": "category5",
-                  "notes": "tag5 notes",
+                  "name": "E1",
+                  "category": "default",
+                  "notes": "example tag 1",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
@@ -11608,7 +10280,9 @@
                 }
               ],
               "termFrequency": "normal",
-              "wordClasses": []
+              "wordClasses": [
+                "n"
+              ]
             }
           ],
           "definitions": [
@@ -11616,23 +10290,23 @@
               "sequence": 2,
               "dictionary": "Test Dictionary 2",
               "glossary": [
-                "definition3",
-                "definition4"
+                "daasu definition 1",
+                "daasu definition 2"
               ],
               "definitionTags": [
                 {
-                  "name": "tag1",
-                  "category": "category1",
-                  "notes": "tag1 notes",
+                  "name": "abbr",
+                  "category": "default",
+                  "notes": "abbreviation",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
                   "redundant": false
                 },
                 {
-                  "name": "tag2",
-                  "category": "category2",
-                  "notes": "tag2 notes",
+                  "name": "n",
+                  "category": "partOfSpeech",
+                  "notes": "noun",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
@@ -11746,27 +10420,18 @@
               "reading": "うちこむ",
               "termTags": [
                 {
-                  "name": "tag3",
-                  "category": "category3",
-                  "notes": "tag3 notes",
-                  "order": 0,
-                  "score": 0,
-                  "dictionary": "Test Dictionary 2",
-                  "redundant": false
-                },
-                {
-                  "name": "tag4",
-                  "category": "category4",
-                  "notes": "tag4 notes",
+                  "name": "E1",
+                  "category": "default",
+                  "notes": "example tag 1",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
                   "redundant": false
                 },
                 {
-                  "name": "tag5",
-                  "category": "category5",
-                  "notes": "tag5 notes",
+                  "name": "P",
+                  "category": "popular",
+                  "notes": "popular term",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
@@ -11849,23 +10514,14 @@
             }
           ],
           "glossary": [
-            "definition13",
-            "definition14"
+            "uchikomu definition 1",
+            "uchikomu definition 2"
           ],
           "definitionTags": [
             {
-              "name": "tag1",
-              "category": "category1",
-              "notes": "tag1 notes",
-              "order": 0,
-              "score": 0,
-              "dictionary": "Test Dictionary 2",
-              "redundant": false
-            },
-            {
-              "name": "tag2",
-              "category": "category2",
-              "notes": "tag2 notes",
+              "name": "vt",
+              "category": "partOfSpeech",
+              "notes": "transitive verb",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -11874,27 +10530,18 @@
           ],
           "termTags": [
             {
-              "name": "tag3",
-              "category": "category3",
-              "notes": "tag3 notes",
-              "order": 0,
-              "score": 0,
-              "dictionary": "Test Dictionary 2",
-              "redundant": false
-            },
-            {
-              "name": "tag4",
-              "category": "category4",
-              "notes": "tag4 notes",
+              "name": "E1",
+              "category": "default",
+              "notes": "example tag 1",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
               "redundant": false
             },
             {
-              "name": "tag5",
-              "category": "category5",
-              "notes": "tag5 notes",
+              "name": "P",
+              "category": "popular",
+              "notes": "popular term",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -12066,27 +10713,18 @@
               "reading": "ぶちこむ",
               "termTags": [
                 {
-                  "name": "tag3",
-                  "category": "category3",
-                  "notes": "tag3 notes",
-                  "order": 0,
-                  "score": 0,
-                  "dictionary": "Test Dictionary 2",
-                  "redundant": false
-                },
-                {
-                  "name": "tag4",
-                  "category": "category4",
-                  "notes": "tag4 notes",
+                  "name": "E1",
+                  "category": "default",
+                  "notes": "example tag 1",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
                   "redundant": false
                 },
                 {
-                  "name": "tag5",
-                  "category": "category5",
-                  "notes": "tag5 notes",
+                  "name": "P",
+                  "category": "popular",
+                  "notes": "popular term",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
@@ -12169,23 +10807,14 @@
             }
           ],
           "glossary": [
-            "definition17",
-            "definition18"
+            "buchikomu definition 1",
+            "buchikomu definition 2"
           ],
           "definitionTags": [
             {
-              "name": "tag1",
-              "category": "category1",
-              "notes": "tag1 notes",
-              "order": 0,
-              "score": 0,
-              "dictionary": "Test Dictionary 2",
-              "redundant": false
-            },
-            {
-              "name": "tag2",
-              "category": "category2",
-              "notes": "tag2 notes",
+              "name": "vt",
+              "category": "partOfSpeech",
+              "notes": "transitive verb",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -12194,27 +10823,18 @@
           ],
           "termTags": [
             {
-              "name": "tag3",
-              "category": "category3",
-              "notes": "tag3 notes",
-              "order": 0,
-              "score": 0,
-              "dictionary": "Test Dictionary 2",
-              "redundant": false
-            },
-            {
-              "name": "tag4",
-              "category": "category4",
-              "notes": "tag4 notes",
+              "name": "E1",
+              "category": "default",
+              "notes": "example tag 1",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
               "redundant": false
             },
             {
-              "name": "tag5",
-              "category": "category5",
-              "notes": "tag5 notes",
+              "name": "P",
+              "category": "popular",
+              "notes": "popular term",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -12386,27 +11006,18 @@
               "reading": "うちこむ",
               "termTags": [
                 {
-                  "name": "tag5",
-                  "category": "category5",
-                  "notes": "tag5 notes",
-                  "order": 0,
-                  "score": 0,
-                  "dictionary": "Test Dictionary 2",
-                  "redundant": false
-                },
-                {
-                  "name": "tag6",
+                  "name": "E2",
                   "category": "default",
-                  "notes": "",
+                  "notes": "example tag 2",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
                   "redundant": false
                 },
                 {
-                  "name": "tag7",
-                  "category": "default",
-                  "notes": "",
+                  "name": "P",
+                  "category": "popular",
+                  "notes": "popular term",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
@@ -12489,23 +11100,14 @@
             }
           ],
           "glossary": [
-            "definition15",
-            "definition16"
+            "uchikomu definition 3",
+            "uchikomu definition 4"
           ],
           "definitionTags": [
             {
-              "name": "tag1",
-              "category": "category1",
-              "notes": "tag1 notes",
-              "order": 0,
-              "score": 0,
-              "dictionary": "Test Dictionary 2",
-              "redundant": false
-            },
-            {
-              "name": "tag2",
-              "category": "category2",
-              "notes": "tag2 notes",
+              "name": "vt",
+              "category": "partOfSpeech",
+              "notes": "transitive verb",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -12514,27 +11116,18 @@
           ],
           "termTags": [
             {
-              "name": "tag5",
-              "category": "category5",
-              "notes": "tag5 notes",
-              "order": 0,
-              "score": 0,
-              "dictionary": "Test Dictionary 2",
-              "redundant": false
-            },
-            {
-              "name": "tag6",
+              "name": "E2",
               "category": "default",
-              "notes": "",
+              "notes": "example tag 2",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
               "redundant": false
             },
             {
-              "name": "tag7",
-              "category": "default",
-              "notes": "",
+              "name": "P",
+              "category": "popular",
+              "notes": "popular term",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -12706,27 +11299,18 @@
               "reading": "ぶちこむ",
               "termTags": [
                 {
-                  "name": "tag3",
-                  "category": "category3",
-                  "notes": "tag3 notes",
-                  "order": 0,
-                  "score": 0,
-                  "dictionary": "Test Dictionary 2",
-                  "redundant": false
-                },
-                {
-                  "name": "tag4",
-                  "category": "category4",
-                  "notes": "tag4 notes",
+                  "name": "E2",
+                  "category": "default",
+                  "notes": "example tag 2",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
                   "redundant": false
                 },
                 {
-                  "name": "tag5",
-                  "category": "category5",
-                  "notes": "tag5 notes",
+                  "name": "P",
+                  "category": "popular",
+                  "notes": "popular term",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
@@ -12809,23 +11393,14 @@
             }
           ],
           "glossary": [
-            "definition19",
-            "definition20"
+            "buchikomu definition 3",
+            "buchikomu definition 4"
           ],
           "definitionTags": [
             {
-              "name": "tag1",
-              "category": "category1",
-              "notes": "tag1 notes",
-              "order": 0,
-              "score": 0,
-              "dictionary": "Test Dictionary 2",
-              "redundant": false
-            },
-            {
-              "name": "tag2",
-              "category": "category2",
-              "notes": "tag2 notes",
+              "name": "vt",
+              "category": "partOfSpeech",
+              "notes": "transitive verb",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -12834,27 +11409,18 @@
           ],
           "termTags": [
             {
-              "name": "tag3",
-              "category": "category3",
-              "notes": "tag3 notes",
-              "order": 0,
-              "score": 0,
-              "dictionary": "Test Dictionary 2",
-              "redundant": false
-            },
-            {
-              "name": "tag4",
-              "category": "category4",
-              "notes": "tag4 notes",
+              "name": "E2",
+              "category": "default",
+              "notes": "example tag 2",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
               "redundant": false
             },
             {
-              "name": "tag5",
-              "category": "category5",
-              "notes": "tag5 notes",
+              "name": "P",
+              "category": "popular",
+              "notes": "popular term",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -13024,27 +11590,18 @@
               "reading": "うつ",
               "termTags": [
                 {
-                  "name": "tag3",
-                  "category": "category3",
-                  "notes": "tag3 notes",
-                  "order": 0,
-                  "score": 0,
-                  "dictionary": "Test Dictionary 2",
-                  "redundant": false
-                },
-                {
-                  "name": "tag4",
-                  "category": "category4",
-                  "notes": "tag4 notes",
+                  "name": "E1",
+                  "category": "default",
+                  "notes": "example tag 1",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
                   "redundant": false
                 },
                 {
-                  "name": "tag5",
-                  "category": "category5",
-                  "notes": "tag5 notes",
+                  "name": "P",
+                  "category": "popular",
+                  "notes": "popular term",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
@@ -13097,23 +11654,14 @@
             }
           ],
           "glossary": [
-            "definition5",
-            "definition6"
+            "utsu definition 1",
+            "utsu definition 2"
           ],
           "definitionTags": [
             {
-              "name": "tag1",
-              "category": "category1",
-              "notes": "tag1 notes",
-              "order": 0,
-              "score": 0,
-              "dictionary": "Test Dictionary 2",
-              "redundant": false
-            },
-            {
-              "name": "tag2",
-              "category": "category2",
-              "notes": "tag2 notes",
+              "name": "vt",
+              "category": "partOfSpeech",
+              "notes": "transitive verb",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -13122,27 +11670,18 @@
           ],
           "termTags": [
             {
-              "name": "tag3",
-              "category": "category3",
-              "notes": "tag3 notes",
-              "order": 0,
-              "score": 0,
-              "dictionary": "Test Dictionary 2",
-              "redundant": false
-            },
-            {
-              "name": "tag4",
-              "category": "category4",
-              "notes": "tag4 notes",
+              "name": "E1",
+              "category": "default",
+              "notes": "example tag 1",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
               "redundant": false
             },
             {
-              "name": "tag5",
-              "category": "category5",
-              "notes": "tag5 notes",
+              "name": "P",
+              "category": "popular",
+              "notes": "popular term",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -13256,27 +11795,18 @@
               "reading": "ぶつ",
               "termTags": [
                 {
-                  "name": "tag3",
-                  "category": "category3",
-                  "notes": "tag3 notes",
-                  "order": 0,
-                  "score": 0,
-                  "dictionary": "Test Dictionary 2",
-                  "redundant": false
-                },
-                {
-                  "name": "tag4",
-                  "category": "category4",
-                  "notes": "tag4 notes",
+                  "name": "E1",
+                  "category": "default",
+                  "notes": "example tag 1",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
                   "redundant": false
                 },
                 {
-                  "name": "tag5",
-                  "category": "category5",
-                  "notes": "tag5 notes",
+                  "name": "P",
+                  "category": "popular",
+                  "notes": "popular term",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
@@ -13329,23 +11859,14 @@
             }
           ],
           "glossary": [
-            "definition9",
-            "definition10"
+            "butsu definition 1",
+            "butsu definition 2"
           ],
           "definitionTags": [
             {
-              "name": "tag1",
-              "category": "category1",
-              "notes": "tag1 notes",
-              "order": 0,
-              "score": 0,
-              "dictionary": "Test Dictionary 2",
-              "redundant": false
-            },
-            {
-              "name": "tag2",
-              "category": "category2",
-              "notes": "tag2 notes",
+              "name": "vt",
+              "category": "partOfSpeech",
+              "notes": "transitive verb",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -13354,27 +11875,18 @@
           ],
           "termTags": [
             {
-              "name": "tag3",
-              "category": "category3",
-              "notes": "tag3 notes",
-              "order": 0,
-              "score": 0,
-              "dictionary": "Test Dictionary 2",
-              "redundant": false
-            },
-            {
-              "name": "tag4",
-              "category": "category4",
-              "notes": "tag4 notes",
+              "name": "E1",
+              "category": "default",
+              "notes": "example tag 1",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
               "redundant": false
             },
             {
-              "name": "tag5",
-              "category": "category5",
-              "notes": "tag5 notes",
+              "name": "P",
+              "category": "popular",
+              "notes": "popular term",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -13488,27 +12000,18 @@
               "reading": "うつ",
               "termTags": [
                 {
-                  "name": "tag3",
-                  "category": "category3",
-                  "notes": "tag3 notes",
-                  "order": 0,
-                  "score": 0,
-                  "dictionary": "Test Dictionary 2",
-                  "redundant": false
-                },
-                {
-                  "name": "tag4",
-                  "category": "category4",
-                  "notes": "tag4 notes",
+                  "name": "E2",
+                  "category": "default",
+                  "notes": "example tag 2",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
                   "redundant": false
                 },
                 {
-                  "name": "tag5",
-                  "category": "category5",
-                  "notes": "tag5 notes",
+                  "name": "P",
+                  "category": "popular",
+                  "notes": "popular term",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
@@ -13561,23 +12064,14 @@
             }
           ],
           "glossary": [
-            "definition7",
-            "definition8"
+            "utsu definition 3",
+            "utsu definition 4"
           ],
           "definitionTags": [
             {
-              "name": "tag1",
-              "category": "category1",
-              "notes": "tag1 notes",
-              "order": 0,
-              "score": 0,
-              "dictionary": "Test Dictionary 2",
-              "redundant": false
-            },
-            {
-              "name": "tag2",
-              "category": "category2",
-              "notes": "tag2 notes",
+              "name": "vt",
+              "category": "partOfSpeech",
+              "notes": "transitive verb",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -13586,27 +12080,18 @@
           ],
           "termTags": [
             {
-              "name": "tag3",
-              "category": "category3",
-              "notes": "tag3 notes",
-              "order": 0,
-              "score": 0,
-              "dictionary": "Test Dictionary 2",
-              "redundant": false
-            },
-            {
-              "name": "tag4",
-              "category": "category4",
-              "notes": "tag4 notes",
+              "name": "E2",
+              "category": "default",
+              "notes": "example tag 2",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
               "redundant": false
             },
             {
-              "name": "tag5",
-              "category": "category5",
-              "notes": "tag5 notes",
+              "name": "P",
+              "category": "popular",
+              "notes": "popular term",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -13720,27 +12205,18 @@
               "reading": "ぶつ",
               "termTags": [
                 {
-                  "name": "tag3",
-                  "category": "category3",
-                  "notes": "tag3 notes",
-                  "order": 0,
-                  "score": 0,
-                  "dictionary": "Test Dictionary 2",
-                  "redundant": false
-                },
-                {
-                  "name": "tag4",
-                  "category": "category4",
-                  "notes": "tag4 notes",
+                  "name": "E2",
+                  "category": "default",
+                  "notes": "example tag 2",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
                   "redundant": false
                 },
                 {
-                  "name": "tag5",
-                  "category": "category5",
-                  "notes": "tag5 notes",
+                  "name": "P",
+                  "category": "popular",
+                  "notes": "popular term",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
@@ -13793,23 +12269,14 @@
             }
           ],
           "glossary": [
-            "definition11",
-            "definition12"
+            "butsu definition 3",
+            "butsu definition 4"
           ],
           "definitionTags": [
             {
-              "name": "tag1",
-              "category": "category1",
-              "notes": "tag1 notes",
-              "order": 0,
-              "score": 0,
-              "dictionary": "Test Dictionary 2",
-              "redundant": false
-            },
-            {
-              "name": "tag2",
-              "category": "category2",
-              "notes": "tag2 notes",
+              "name": "vt",
+              "category": "partOfSpeech",
+              "notes": "transitive verb",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -13818,27 +12285,18 @@
           ],
           "termTags": [
             {
-              "name": "tag3",
-              "category": "category3",
-              "notes": "tag3 notes",
-              "order": 0,
-              "score": 0,
-              "dictionary": "Test Dictionary 2",
-              "redundant": false
-            },
-            {
-              "name": "tag4",
-              "category": "category4",
-              "notes": "tag4 notes",
+              "name": "E2",
+              "category": "default",
+              "notes": "example tag 2",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
               "redundant": false
             },
             {
-              "name": "tag5",
-              "category": "category5",
-              "notes": "tag5 notes",
+              "name": "P",
+              "category": "popular",
+              "notes": "popular term",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -13950,27 +12408,9 @@
               "reading": "だ",
               "termTags": [
                 {
-                  "name": "tag3",
-                  "category": "category3",
-                  "notes": "tag3 notes",
-                  "order": 0,
-                  "score": 0,
-                  "dictionary": "Test Dictionary 2",
-                  "redundant": false
-                },
-                {
-                  "name": "tag4",
-                  "category": "category4",
-                  "notes": "tag4 notes",
-                  "order": 0,
-                  "score": 0,
-                  "dictionary": "Test Dictionary 2",
-                  "redundant": false
-                },
-                {
-                  "name": "tag5",
-                  "category": "category5",
-                  "notes": "tag5 notes",
+                  "name": "E1",
+                  "category": "default",
+                  "notes": "example tag 1",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
@@ -14013,27 +12453,20 @@
                 }
               ],
               "termFrequency": "normal",
-              "wordClasses": []
+              "wordClasses": [
+                "n"
+              ]
             }
           ],
           "glossary": [
-            "definition1",
-            "definition2"
+            "da definition 1",
+            "da definition 2"
           ],
           "definitionTags": [
             {
-              "name": "tag1",
-              "category": "category1",
-              "notes": "tag1 notes",
-              "order": 0,
-              "score": 0,
-              "dictionary": "Test Dictionary 2",
-              "redundant": false
-            },
-            {
-              "name": "tag2",
-              "category": "category2",
-              "notes": "tag2 notes",
+              "name": "n",
+              "category": "partOfSpeech",
+              "notes": "noun",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -14042,27 +12475,9 @@
           ],
           "termTags": [
             {
-              "name": "tag3",
-              "category": "category3",
-              "notes": "tag3 notes",
-              "order": 0,
-              "score": 0,
-              "dictionary": "Test Dictionary 2",
-              "redundant": false
-            },
-            {
-              "name": "tag4",
-              "category": "category4",
-              "notes": "tag4 notes",
-              "order": 0,
-              "score": 0,
-              "dictionary": "Test Dictionary 2",
-              "redundant": false
-            },
-            {
-              "name": "tag5",
-              "category": "category5",
-              "notes": "tag5 notes",
+              "name": "E1",
+              "category": "default",
+              "notes": "example tag 1",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -14170,27 +12585,9 @@
               "reading": "ダース",
               "termTags": [
                 {
-                  "name": "tag3",
-                  "category": "category3",
-                  "notes": "tag3 notes",
-                  "order": 0,
-                  "score": 0,
-                  "dictionary": "Test Dictionary 2",
-                  "redundant": false
-                },
-                {
-                  "name": "tag4",
-                  "category": "category4",
-                  "notes": "tag4 notes",
-                  "order": 0,
-                  "score": 0,
-                  "dictionary": "Test Dictionary 2",
-                  "redundant": false
-                },
-                {
-                  "name": "tag5",
-                  "category": "category5",
-                  "notes": "tag5 notes",
+                  "name": "E1",
+                  "category": "default",
+                  "notes": "example tag 1",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
@@ -14233,27 +12630,29 @@
                 }
               ],
               "termFrequency": "normal",
-              "wordClasses": []
+              "wordClasses": [
+                "n"
+              ]
             }
           ],
           "glossary": [
-            "definition3",
-            "definition4"
+            "daasu definition 1",
+            "daasu definition 2"
           ],
           "definitionTags": [
             {
-              "name": "tag1",
-              "category": "category1",
-              "notes": "tag1 notes",
+              "name": "abbr",
+              "category": "default",
+              "notes": "abbreviation",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
               "redundant": false
             },
             {
-              "name": "tag2",
-              "category": "category2",
-              "notes": "tag2 notes",
+              "name": "n",
+              "category": "partOfSpeech",
+              "notes": "noun",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -14262,27 +12661,9 @@
           ],
           "termTags": [
             {
-              "name": "tag3",
-              "category": "category3",
-              "notes": "tag3 notes",
-              "order": 0,
-              "score": 0,
-              "dictionary": "Test Dictionary 2",
-              "redundant": false
-            },
-            {
-              "name": "tag4",
-              "category": "category4",
-              "notes": "tag4 notes",
-              "order": 0,
-              "score": 0,
-              "dictionary": "Test Dictionary 2",
-              "redundant": false
-            },
-            {
-              "name": "tag5",
-              "category": "category5",
-              "notes": "tag5 notes",
+              "name": "E1",
+              "category": "default",
+              "notes": "example tag 1",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -14395,27 +12776,18 @@
               "reading": "うちこむ",
               "termTags": [
                 {
-                  "name": "tag3",
-                  "category": "category3",
-                  "notes": "tag3 notes",
-                  "order": 0,
-                  "score": 0,
-                  "dictionary": "Test Dictionary 2",
-                  "redundant": false
-                },
-                {
-                  "name": "tag4",
-                  "category": "category4",
-                  "notes": "tag4 notes",
+                  "name": "E1",
+                  "category": "default",
+                  "notes": "example tag 1",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
                   "redundant": false
                 },
                 {
-                  "name": "tag5",
-                  "category": "category5",
-                  "notes": "tag5 notes",
+                  "name": "P",
+                  "category": "popular",
+                  "notes": "popular term",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
@@ -14498,23 +12870,14 @@
             }
           ],
           "glossary": [
-            "definition13",
-            "definition14"
+            "uchikomu definition 1",
+            "uchikomu definition 2"
           ],
           "definitionTags": [
             {
-              "name": "tag1",
-              "category": "category1",
-              "notes": "tag1 notes",
-              "order": 0,
-              "score": 0,
-              "dictionary": "Test Dictionary 2",
-              "redundant": false
-            },
-            {
-              "name": "tag2",
-              "category": "category2",
-              "notes": "tag2 notes",
+              "name": "vt",
+              "category": "partOfSpeech",
+              "notes": "transitive verb",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -14523,27 +12886,18 @@
           ],
           "termTags": [
             {
-              "name": "tag3",
-              "category": "category3",
-              "notes": "tag3 notes",
-              "order": 0,
-              "score": 0,
-              "dictionary": "Test Dictionary 2",
-              "redundant": false
-            },
-            {
-              "name": "tag4",
-              "category": "category4",
-              "notes": "tag4 notes",
+              "name": "E1",
+              "category": "default",
+              "notes": "example tag 1",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
               "redundant": false
             },
             {
-              "name": "tag5",
-              "category": "category5",
-              "notes": "tag5 notes",
+              "name": "P",
+              "category": "popular",
+              "notes": "popular term",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -14711,27 +13065,18 @@
               "reading": "ぶちこむ",
               "termTags": [
                 {
-                  "name": "tag3",
-                  "category": "category3",
-                  "notes": "tag3 notes",
-                  "order": 0,
-                  "score": 0,
-                  "dictionary": "Test Dictionary 2",
-                  "redundant": false
-                },
-                {
-                  "name": "tag4",
-                  "category": "category4",
-                  "notes": "tag4 notes",
+                  "name": "E1",
+                  "category": "default",
+                  "notes": "example tag 1",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
                   "redundant": false
                 },
                 {
-                  "name": "tag5",
-                  "category": "category5",
-                  "notes": "tag5 notes",
+                  "name": "P",
+                  "category": "popular",
+                  "notes": "popular term",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
@@ -14814,23 +13159,14 @@
             }
           ],
           "glossary": [
-            "definition17",
-            "definition18"
+            "buchikomu definition 1",
+            "buchikomu definition 2"
           ],
           "definitionTags": [
             {
-              "name": "tag1",
-              "category": "category1",
-              "notes": "tag1 notes",
-              "order": 0,
-              "score": 0,
-              "dictionary": "Test Dictionary 2",
-              "redundant": false
-            },
-            {
-              "name": "tag2",
-              "category": "category2",
-              "notes": "tag2 notes",
+              "name": "vt",
+              "category": "partOfSpeech",
+              "notes": "transitive verb",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -14839,27 +13175,18 @@
           ],
           "termTags": [
             {
-              "name": "tag3",
-              "category": "category3",
-              "notes": "tag3 notes",
-              "order": 0,
-              "score": 0,
-              "dictionary": "Test Dictionary 2",
-              "redundant": false
-            },
-            {
-              "name": "tag4",
-              "category": "category4",
-              "notes": "tag4 notes",
+              "name": "E1",
+              "category": "default",
+              "notes": "example tag 1",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
               "redundant": false
             },
             {
-              "name": "tag5",
-              "category": "category5",
-              "notes": "tag5 notes",
+              "name": "P",
+              "category": "popular",
+              "notes": "popular term",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -15027,27 +13354,18 @@
               "reading": "うちこむ",
               "termTags": [
                 {
-                  "name": "tag5",
-                  "category": "category5",
-                  "notes": "tag5 notes",
-                  "order": 0,
-                  "score": 0,
-                  "dictionary": "Test Dictionary 2",
-                  "redundant": false
-                },
-                {
-                  "name": "tag6",
+                  "name": "E2",
                   "category": "default",
-                  "notes": "",
+                  "notes": "example tag 2",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
                   "redundant": false
                 },
                 {
-                  "name": "tag7",
-                  "category": "default",
-                  "notes": "",
+                  "name": "P",
+                  "category": "popular",
+                  "notes": "popular term",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
@@ -15130,23 +13448,14 @@
             }
           ],
           "glossary": [
-            "definition15",
-            "definition16"
+            "uchikomu definition 3",
+            "uchikomu definition 4"
           ],
           "definitionTags": [
             {
-              "name": "tag1",
-              "category": "category1",
-              "notes": "tag1 notes",
-              "order": 0,
-              "score": 0,
-              "dictionary": "Test Dictionary 2",
-              "redundant": false
-            },
-            {
-              "name": "tag2",
-              "category": "category2",
-              "notes": "tag2 notes",
+              "name": "vt",
+              "category": "partOfSpeech",
+              "notes": "transitive verb",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -15155,27 +13464,18 @@
           ],
           "termTags": [
             {
-              "name": "tag5",
-              "category": "category5",
-              "notes": "tag5 notes",
-              "order": 0,
-              "score": 0,
-              "dictionary": "Test Dictionary 2",
-              "redundant": false
-            },
-            {
-              "name": "tag6",
+              "name": "E2",
               "category": "default",
-              "notes": "",
+              "notes": "example tag 2",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
               "redundant": false
             },
             {
-              "name": "tag7",
-              "category": "default",
-              "notes": "",
+              "name": "P",
+              "category": "popular",
+              "notes": "popular term",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -15343,27 +13643,18 @@
               "reading": "ぶちこむ",
               "termTags": [
                 {
-                  "name": "tag3",
-                  "category": "category3",
-                  "notes": "tag3 notes",
-                  "order": 0,
-                  "score": 0,
-                  "dictionary": "Test Dictionary 2",
-                  "redundant": false
-                },
-                {
-                  "name": "tag4",
-                  "category": "category4",
-                  "notes": "tag4 notes",
+                  "name": "E2",
+                  "category": "default",
+                  "notes": "example tag 2",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
                   "redundant": false
                 },
                 {
-                  "name": "tag5",
-                  "category": "category5",
-                  "notes": "tag5 notes",
+                  "name": "P",
+                  "category": "popular",
+                  "notes": "popular term",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
@@ -15446,23 +13737,14 @@
             }
           ],
           "glossary": [
-            "definition19",
-            "definition20"
+            "buchikomu definition 3",
+            "buchikomu definition 4"
           ],
           "definitionTags": [
             {
-              "name": "tag1",
-              "category": "category1",
-              "notes": "tag1 notes",
-              "order": 0,
-              "score": 0,
-              "dictionary": "Test Dictionary 2",
-              "redundant": false
-            },
-            {
-              "name": "tag2",
-              "category": "category2",
-              "notes": "tag2 notes",
+              "name": "vt",
+              "category": "partOfSpeech",
+              "notes": "transitive verb",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -15471,27 +13753,18 @@
           ],
           "termTags": [
             {
-              "name": "tag3",
-              "category": "category3",
-              "notes": "tag3 notes",
-              "order": 0,
-              "score": 0,
-              "dictionary": "Test Dictionary 2",
-              "redundant": false
-            },
-            {
-              "name": "tag4",
-              "category": "category4",
-              "notes": "tag4 notes",
+              "name": "E2",
+              "category": "default",
+              "notes": "example tag 2",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
               "redundant": false
             },
             {
-              "name": "tag5",
-              "category": "category5",
-              "notes": "tag5 notes",
+              "name": "P",
+              "category": "popular",
+              "notes": "popular term",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -15661,27 +13934,18 @@
               "reading": "うつ",
               "termTags": [
                 {
-                  "name": "tag3",
-                  "category": "category3",
-                  "notes": "tag3 notes",
-                  "order": 0,
-                  "score": 0,
-                  "dictionary": "Test Dictionary 2",
-                  "redundant": false
-                },
-                {
-                  "name": "tag4",
-                  "category": "category4",
-                  "notes": "tag4 notes",
+                  "name": "E1",
+                  "category": "default",
+                  "notes": "example tag 1",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
                   "redundant": false
                 },
                 {
-                  "name": "tag5",
-                  "category": "category5",
-                  "notes": "tag5 notes",
+                  "name": "P",
+                  "category": "popular",
+                  "notes": "popular term",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
@@ -15734,23 +13998,14 @@
             }
           ],
           "glossary": [
-            "definition5",
-            "definition6"
+            "utsu definition 1",
+            "utsu definition 2"
           ],
           "definitionTags": [
             {
-              "name": "tag1",
-              "category": "category1",
-              "notes": "tag1 notes",
-              "order": 0,
-              "score": 0,
-              "dictionary": "Test Dictionary 2",
-              "redundant": false
-            },
-            {
-              "name": "tag2",
-              "category": "category2",
-              "notes": "tag2 notes",
+              "name": "vt",
+              "category": "partOfSpeech",
+              "notes": "transitive verb",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -15759,27 +14014,18 @@
           ],
           "termTags": [
             {
-              "name": "tag3",
-              "category": "category3",
-              "notes": "tag3 notes",
-              "order": 0,
-              "score": 0,
-              "dictionary": "Test Dictionary 2",
-              "redundant": false
-            },
-            {
-              "name": "tag4",
-              "category": "category4",
-              "notes": "tag4 notes",
+              "name": "E1",
+              "category": "default",
+              "notes": "example tag 1",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
               "redundant": false
             },
             {
-              "name": "tag5",
-              "category": "category5",
-              "notes": "tag5 notes",
+              "name": "P",
+              "category": "popular",
+              "notes": "popular term",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -15893,27 +14139,18 @@
               "reading": "ぶつ",
               "termTags": [
                 {
-                  "name": "tag3",
-                  "category": "category3",
-                  "notes": "tag3 notes",
-                  "order": 0,
-                  "score": 0,
-                  "dictionary": "Test Dictionary 2",
-                  "redundant": false
-                },
-                {
-                  "name": "tag4",
-                  "category": "category4",
-                  "notes": "tag4 notes",
+                  "name": "E1",
+                  "category": "default",
+                  "notes": "example tag 1",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
                   "redundant": false
                 },
                 {
-                  "name": "tag5",
-                  "category": "category5",
-                  "notes": "tag5 notes",
+                  "name": "P",
+                  "category": "popular",
+                  "notes": "popular term",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
@@ -15966,23 +14203,14 @@
             }
           ],
           "glossary": [
-            "definition9",
-            "definition10"
+            "butsu definition 1",
+            "butsu definition 2"
           ],
           "definitionTags": [
             {
-              "name": "tag1",
-              "category": "category1",
-              "notes": "tag1 notes",
-              "order": 0,
-              "score": 0,
-              "dictionary": "Test Dictionary 2",
-              "redundant": false
-            },
-            {
-              "name": "tag2",
-              "category": "category2",
-              "notes": "tag2 notes",
+              "name": "vt",
+              "category": "partOfSpeech",
+              "notes": "transitive verb",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -15991,27 +14219,18 @@
           ],
           "termTags": [
             {
-              "name": "tag3",
-              "category": "category3",
-              "notes": "tag3 notes",
-              "order": 0,
-              "score": 0,
-              "dictionary": "Test Dictionary 2",
-              "redundant": false
-            },
-            {
-              "name": "tag4",
-              "category": "category4",
-              "notes": "tag4 notes",
+              "name": "E1",
+              "category": "default",
+              "notes": "example tag 1",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
               "redundant": false
             },
             {
-              "name": "tag5",
-              "category": "category5",
-              "notes": "tag5 notes",
+              "name": "P",
+              "category": "popular",
+              "notes": "popular term",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -16125,27 +14344,18 @@
               "reading": "うつ",
               "termTags": [
                 {
-                  "name": "tag3",
-                  "category": "category3",
-                  "notes": "tag3 notes",
-                  "order": 0,
-                  "score": 0,
-                  "dictionary": "Test Dictionary 2",
-                  "redundant": false
-                },
-                {
-                  "name": "tag4",
-                  "category": "category4",
-                  "notes": "tag4 notes",
+                  "name": "E2",
+                  "category": "default",
+                  "notes": "example tag 2",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
                   "redundant": false
                 },
                 {
-                  "name": "tag5",
-                  "category": "category5",
-                  "notes": "tag5 notes",
+                  "name": "P",
+                  "category": "popular",
+                  "notes": "popular term",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
@@ -16198,23 +14408,14 @@
             }
           ],
           "glossary": [
-            "definition7",
-            "definition8"
+            "utsu definition 3",
+            "utsu definition 4"
           ],
           "definitionTags": [
             {
-              "name": "tag1",
-              "category": "category1",
-              "notes": "tag1 notes",
-              "order": 0,
-              "score": 0,
-              "dictionary": "Test Dictionary 2",
-              "redundant": false
-            },
-            {
-              "name": "tag2",
-              "category": "category2",
-              "notes": "tag2 notes",
+              "name": "vt",
+              "category": "partOfSpeech",
+              "notes": "transitive verb",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -16223,27 +14424,18 @@
           ],
           "termTags": [
             {
-              "name": "tag3",
-              "category": "category3",
-              "notes": "tag3 notes",
-              "order": 0,
-              "score": 0,
-              "dictionary": "Test Dictionary 2",
-              "redundant": false
-            },
-            {
-              "name": "tag4",
-              "category": "category4",
-              "notes": "tag4 notes",
+              "name": "E2",
+              "category": "default",
+              "notes": "example tag 2",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
               "redundant": false
             },
             {
-              "name": "tag5",
-              "category": "category5",
-              "notes": "tag5 notes",
+              "name": "P",
+              "category": "popular",
+              "notes": "popular term",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -16357,27 +14549,18 @@
               "reading": "ぶつ",
               "termTags": [
                 {
-                  "name": "tag3",
-                  "category": "category3",
-                  "notes": "tag3 notes",
-                  "order": 0,
-                  "score": 0,
-                  "dictionary": "Test Dictionary 2",
-                  "redundant": false
-                },
-                {
-                  "name": "tag4",
-                  "category": "category4",
-                  "notes": "tag4 notes",
+                  "name": "E2",
+                  "category": "default",
+                  "notes": "example tag 2",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
                   "redundant": false
                 },
                 {
-                  "name": "tag5",
-                  "category": "category5",
-                  "notes": "tag5 notes",
+                  "name": "P",
+                  "category": "popular",
+                  "notes": "popular term",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
@@ -16430,23 +14613,14 @@
             }
           ],
           "glossary": [
-            "definition11",
-            "definition12"
+            "butsu definition 3",
+            "butsu definition 4"
           ],
           "definitionTags": [
             {
-              "name": "tag1",
-              "category": "category1",
-              "notes": "tag1 notes",
-              "order": 0,
-              "score": 0,
-              "dictionary": "Test Dictionary 2",
-              "redundant": false
-            },
-            {
-              "name": "tag2",
-              "category": "category2",
-              "notes": "tag2 notes",
+              "name": "vt",
+              "category": "partOfSpeech",
+              "notes": "transitive verb",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -16455,27 +14629,18 @@
           ],
           "termTags": [
             {
-              "name": "tag3",
-              "category": "category3",
-              "notes": "tag3 notes",
-              "order": 0,
-              "score": 0,
-              "dictionary": "Test Dictionary 2",
-              "redundant": false
-            },
-            {
-              "name": "tag4",
-              "category": "category4",
-              "notes": "tag4 notes",
+              "name": "E2",
+              "category": "default",
+              "notes": "example tag 2",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
               "redundant": false
             },
             {
-              "name": "tag5",
-              "category": "category5",
-              "notes": "tag5 notes",
+              "name": "P",
+              "category": "popular",
+              "notes": "popular term",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -16587,27 +14752,9 @@
               "reading": "だ",
               "termTags": [
                 {
-                  "name": "tag3",
-                  "category": "category3",
-                  "notes": "tag3 notes",
-                  "order": 0,
-                  "score": 0,
-                  "dictionary": "Test Dictionary 2",
-                  "redundant": false
-                },
-                {
-                  "name": "tag4",
-                  "category": "category4",
-                  "notes": "tag4 notes",
-                  "order": 0,
-                  "score": 0,
-                  "dictionary": "Test Dictionary 2",
-                  "redundant": false
-                },
-                {
-                  "name": "tag5",
-                  "category": "category5",
-                  "notes": "tag5 notes",
+                  "name": "E1",
+                  "category": "default",
+                  "notes": "example tag 1",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
@@ -16650,27 +14797,20 @@
                 }
               ],
               "termFrequency": "normal",
-              "wordClasses": []
+              "wordClasses": [
+                "n"
+              ]
             }
           ],
           "glossary": [
-            "definition1",
-            "definition2"
+            "da definition 1",
+            "da definition 2"
           ],
           "definitionTags": [
             {
-              "name": "tag1",
-              "category": "category1",
-              "notes": "tag1 notes",
-              "order": 0,
-              "score": 0,
-              "dictionary": "Test Dictionary 2",
-              "redundant": false
-            },
-            {
-              "name": "tag2",
-              "category": "category2",
-              "notes": "tag2 notes",
+              "name": "n",
+              "category": "partOfSpeech",
+              "notes": "noun",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -16679,27 +14819,9 @@
           ],
           "termTags": [
             {
-              "name": "tag3",
-              "category": "category3",
-              "notes": "tag3 notes",
-              "order": 0,
-              "score": 0,
-              "dictionary": "Test Dictionary 2",
-              "redundant": false
-            },
-            {
-              "name": "tag4",
-              "category": "category4",
-              "notes": "tag4 notes",
-              "order": 0,
-              "score": 0,
-              "dictionary": "Test Dictionary 2",
-              "redundant": false
-            },
-            {
-              "name": "tag5",
-              "category": "category5",
-              "notes": "tag5 notes",
+              "name": "E1",
+              "category": "default",
+              "notes": "example tag 1",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -16807,27 +14929,9 @@
               "reading": "ダース",
               "termTags": [
                 {
-                  "name": "tag3",
-                  "category": "category3",
-                  "notes": "tag3 notes",
-                  "order": 0,
-                  "score": 0,
-                  "dictionary": "Test Dictionary 2",
-                  "redundant": false
-                },
-                {
-                  "name": "tag4",
-                  "category": "category4",
-                  "notes": "tag4 notes",
-                  "order": 0,
-                  "score": 0,
-                  "dictionary": "Test Dictionary 2",
-                  "redundant": false
-                },
-                {
-                  "name": "tag5",
-                  "category": "category5",
-                  "notes": "tag5 notes",
+                  "name": "E1",
+                  "category": "default",
+                  "notes": "example tag 1",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
@@ -16870,27 +14974,29 @@
                 }
               ],
               "termFrequency": "normal",
-              "wordClasses": []
+              "wordClasses": [
+                "n"
+              ]
             }
           ],
           "glossary": [
-            "definition3",
-            "definition4"
+            "daasu definition 1",
+            "daasu definition 2"
           ],
           "definitionTags": [
             {
-              "name": "tag1",
-              "category": "category1",
-              "notes": "tag1 notes",
+              "name": "abbr",
+              "category": "default",
+              "notes": "abbreviation",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
               "redundant": false
             },
             {
-              "name": "tag2",
-              "category": "category2",
-              "notes": "tag2 notes",
+              "name": "n",
+              "category": "partOfSpeech",
+              "notes": "noun",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -16899,27 +15005,9 @@
           ],
           "termTags": [
             {
-              "name": "tag3",
-              "category": "category3",
-              "notes": "tag3 notes",
-              "order": 0,
-              "score": 0,
-              "dictionary": "Test Dictionary 2",
-              "redundant": false
-            },
-            {
-              "name": "tag4",
-              "category": "category4",
-              "notes": "tag4 notes",
-              "order": 0,
-              "score": 0,
-              "dictionary": "Test Dictionary 2",
-              "redundant": false
-            },
-            {
-              "name": "tag5",
-              "category": "category5",
-              "notes": "tag5 notes",
+              "name": "E1",
+              "category": "default",
+              "notes": "example tag 1",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -17032,27 +15120,18 @@
               "reading": "うちこむ",
               "termTags": [
                 {
-                  "name": "tag3",
-                  "category": "category3",
-                  "notes": "tag3 notes",
-                  "order": 0,
-                  "score": 0,
-                  "dictionary": "Test Dictionary 2",
-                  "redundant": false
-                },
-                {
-                  "name": "tag4",
-                  "category": "category4",
-                  "notes": "tag4 notes",
+                  "name": "E1",
+                  "category": "default",
+                  "notes": "example tag 1",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
                   "redundant": false
                 },
                 {
-                  "name": "tag5",
-                  "category": "category5",
-                  "notes": "tag5 notes",
+                  "name": "P",
+                  "category": "popular",
+                  "notes": "popular term",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
@@ -17135,23 +15214,14 @@
             }
           ],
           "glossary": [
-            "definition13",
-            "definition14"
+            "uchikomu definition 1",
+            "uchikomu definition 2"
           ],
           "definitionTags": [
             {
-              "name": "tag1",
-              "category": "category1",
-              "notes": "tag1 notes",
-              "order": 0,
-              "score": 0,
-              "dictionary": "Test Dictionary 2",
-              "redundant": false
-            },
-            {
-              "name": "tag2",
-              "category": "category2",
-              "notes": "tag2 notes",
+              "name": "vt",
+              "category": "partOfSpeech",
+              "notes": "transitive verb",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -17160,27 +15230,18 @@
           ],
           "termTags": [
             {
-              "name": "tag3",
-              "category": "category3",
-              "notes": "tag3 notes",
-              "order": 0,
-              "score": 0,
-              "dictionary": "Test Dictionary 2",
-              "redundant": false
-            },
-            {
-              "name": "tag4",
-              "category": "category4",
-              "notes": "tag4 notes",
+              "name": "E1",
+              "category": "default",
+              "notes": "example tag 1",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
               "redundant": false
             },
             {
-              "name": "tag5",
-              "category": "category5",
-              "notes": "tag5 notes",
+              "name": "P",
+              "category": "popular",
+              "notes": "popular term",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -17348,27 +15409,18 @@
               "reading": "ぶちこむ",
               "termTags": [
                 {
-                  "name": "tag3",
-                  "category": "category3",
-                  "notes": "tag3 notes",
-                  "order": 0,
-                  "score": 0,
-                  "dictionary": "Test Dictionary 2",
-                  "redundant": false
-                },
-                {
-                  "name": "tag4",
-                  "category": "category4",
-                  "notes": "tag4 notes",
+                  "name": "E1",
+                  "category": "default",
+                  "notes": "example tag 1",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
                   "redundant": false
                 },
                 {
-                  "name": "tag5",
-                  "category": "category5",
-                  "notes": "tag5 notes",
+                  "name": "P",
+                  "category": "popular",
+                  "notes": "popular term",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
@@ -17451,23 +15503,14 @@
             }
           ],
           "glossary": [
-            "definition17",
-            "definition18"
+            "buchikomu definition 1",
+            "buchikomu definition 2"
           ],
           "definitionTags": [
             {
-              "name": "tag1",
-              "category": "category1",
-              "notes": "tag1 notes",
-              "order": 0,
-              "score": 0,
-              "dictionary": "Test Dictionary 2",
-              "redundant": false
-            },
-            {
-              "name": "tag2",
-              "category": "category2",
-              "notes": "tag2 notes",
+              "name": "vt",
+              "category": "partOfSpeech",
+              "notes": "transitive verb",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -17476,27 +15519,18 @@
           ],
           "termTags": [
             {
-              "name": "tag3",
-              "category": "category3",
-              "notes": "tag3 notes",
-              "order": 0,
-              "score": 0,
-              "dictionary": "Test Dictionary 2",
-              "redundant": false
-            },
-            {
-              "name": "tag4",
-              "category": "category4",
-              "notes": "tag4 notes",
+              "name": "E1",
+              "category": "default",
+              "notes": "example tag 1",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
               "redundant": false
             },
             {
-              "name": "tag5",
-              "category": "category5",
-              "notes": "tag5 notes",
+              "name": "P",
+              "category": "popular",
+              "notes": "popular term",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -17664,27 +15698,18 @@
               "reading": "うちこむ",
               "termTags": [
                 {
-                  "name": "tag5",
-                  "category": "category5",
-                  "notes": "tag5 notes",
-                  "order": 0,
-                  "score": 0,
-                  "dictionary": "Test Dictionary 2",
-                  "redundant": false
-                },
-                {
-                  "name": "tag6",
+                  "name": "E2",
                   "category": "default",
-                  "notes": "",
+                  "notes": "example tag 2",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
                   "redundant": false
                 },
                 {
-                  "name": "tag7",
-                  "category": "default",
-                  "notes": "",
+                  "name": "P",
+                  "category": "popular",
+                  "notes": "popular term",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
@@ -17767,23 +15792,14 @@
             }
           ],
           "glossary": [
-            "definition15",
-            "definition16"
+            "uchikomu definition 3",
+            "uchikomu definition 4"
           ],
           "definitionTags": [
             {
-              "name": "tag1",
-              "category": "category1",
-              "notes": "tag1 notes",
-              "order": 0,
-              "score": 0,
-              "dictionary": "Test Dictionary 2",
-              "redundant": false
-            },
-            {
-              "name": "tag2",
-              "category": "category2",
-              "notes": "tag2 notes",
+              "name": "vt",
+              "category": "partOfSpeech",
+              "notes": "transitive verb",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -17792,27 +15808,18 @@
           ],
           "termTags": [
             {
-              "name": "tag5",
-              "category": "category5",
-              "notes": "tag5 notes",
-              "order": 0,
-              "score": 0,
-              "dictionary": "Test Dictionary 2",
-              "redundant": false
-            },
-            {
-              "name": "tag6",
+              "name": "E2",
               "category": "default",
-              "notes": "",
+              "notes": "example tag 2",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
               "redundant": false
             },
             {
-              "name": "tag7",
-              "category": "default",
-              "notes": "",
+              "name": "P",
+              "category": "popular",
+              "notes": "popular term",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -17980,27 +15987,18 @@
               "reading": "ぶちこむ",
               "termTags": [
                 {
-                  "name": "tag3",
-                  "category": "category3",
-                  "notes": "tag3 notes",
-                  "order": 0,
-                  "score": 0,
-                  "dictionary": "Test Dictionary 2",
-                  "redundant": false
-                },
-                {
-                  "name": "tag4",
-                  "category": "category4",
-                  "notes": "tag4 notes",
+                  "name": "E2",
+                  "category": "default",
+                  "notes": "example tag 2",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
                   "redundant": false
                 },
                 {
-                  "name": "tag5",
-                  "category": "category5",
-                  "notes": "tag5 notes",
+                  "name": "P",
+                  "category": "popular",
+                  "notes": "popular term",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
@@ -18083,23 +16081,14 @@
             }
           ],
           "glossary": [
-            "definition19",
-            "definition20"
+            "buchikomu definition 3",
+            "buchikomu definition 4"
           ],
           "definitionTags": [
             {
-              "name": "tag1",
-              "category": "category1",
-              "notes": "tag1 notes",
-              "order": 0,
-              "score": 0,
-              "dictionary": "Test Dictionary 2",
-              "redundant": false
-            },
-            {
-              "name": "tag2",
-              "category": "category2",
-              "notes": "tag2 notes",
+              "name": "vt",
+              "category": "partOfSpeech",
+              "notes": "transitive verb",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -18108,27 +16097,18 @@
           ],
           "termTags": [
             {
-              "name": "tag3",
-              "category": "category3",
-              "notes": "tag3 notes",
-              "order": 0,
-              "score": 0,
-              "dictionary": "Test Dictionary 2",
-              "redundant": false
-            },
-            {
-              "name": "tag4",
-              "category": "category4",
-              "notes": "tag4 notes",
+              "name": "E2",
+              "category": "default",
+              "notes": "example tag 2",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
               "redundant": false
             },
             {
-              "name": "tag5",
-              "category": "category5",
-              "notes": "tag5 notes",
+              "name": "P",
+              "category": "popular",
+              "notes": "popular term",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -18298,27 +16278,18 @@
               "reading": "うつ",
               "termTags": [
                 {
-                  "name": "tag3",
-                  "category": "category3",
-                  "notes": "tag3 notes",
-                  "order": 0,
-                  "score": 0,
-                  "dictionary": "Test Dictionary 2",
-                  "redundant": false
-                },
-                {
-                  "name": "tag4",
-                  "category": "category4",
-                  "notes": "tag4 notes",
+                  "name": "E1",
+                  "category": "default",
+                  "notes": "example tag 1",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
                   "redundant": false
                 },
                 {
-                  "name": "tag5",
-                  "category": "category5",
-                  "notes": "tag5 notes",
+                  "name": "P",
+                  "category": "popular",
+                  "notes": "popular term",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
@@ -18371,23 +16342,14 @@
             }
           ],
           "glossary": [
-            "definition5",
-            "definition6"
+            "utsu definition 1",
+            "utsu definition 2"
           ],
           "definitionTags": [
             {
-              "name": "tag1",
-              "category": "category1",
-              "notes": "tag1 notes",
-              "order": 0,
-              "score": 0,
-              "dictionary": "Test Dictionary 2",
-              "redundant": false
-            },
-            {
-              "name": "tag2",
-              "category": "category2",
-              "notes": "tag2 notes",
+              "name": "vt",
+              "category": "partOfSpeech",
+              "notes": "transitive verb",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -18396,27 +16358,18 @@
           ],
           "termTags": [
             {
-              "name": "tag3",
-              "category": "category3",
-              "notes": "tag3 notes",
-              "order": 0,
-              "score": 0,
-              "dictionary": "Test Dictionary 2",
-              "redundant": false
-            },
-            {
-              "name": "tag4",
-              "category": "category4",
-              "notes": "tag4 notes",
+              "name": "E1",
+              "category": "default",
+              "notes": "example tag 1",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
               "redundant": false
             },
             {
-              "name": "tag5",
-              "category": "category5",
-              "notes": "tag5 notes",
+              "name": "P",
+              "category": "popular",
+              "notes": "popular term",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -18530,27 +16483,18 @@
               "reading": "ぶつ",
               "termTags": [
                 {
-                  "name": "tag3",
-                  "category": "category3",
-                  "notes": "tag3 notes",
-                  "order": 0,
-                  "score": 0,
-                  "dictionary": "Test Dictionary 2",
-                  "redundant": false
-                },
-                {
-                  "name": "tag4",
-                  "category": "category4",
-                  "notes": "tag4 notes",
+                  "name": "E1",
+                  "category": "default",
+                  "notes": "example tag 1",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
                   "redundant": false
                 },
                 {
-                  "name": "tag5",
-                  "category": "category5",
-                  "notes": "tag5 notes",
+                  "name": "P",
+                  "category": "popular",
+                  "notes": "popular term",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
@@ -18603,23 +16547,14 @@
             }
           ],
           "glossary": [
-            "definition9",
-            "definition10"
+            "butsu definition 1",
+            "butsu definition 2"
           ],
           "definitionTags": [
             {
-              "name": "tag1",
-              "category": "category1",
-              "notes": "tag1 notes",
-              "order": 0,
-              "score": 0,
-              "dictionary": "Test Dictionary 2",
-              "redundant": false
-            },
-            {
-              "name": "tag2",
-              "category": "category2",
-              "notes": "tag2 notes",
+              "name": "vt",
+              "category": "partOfSpeech",
+              "notes": "transitive verb",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -18628,27 +16563,18 @@
           ],
           "termTags": [
             {
-              "name": "tag3",
-              "category": "category3",
-              "notes": "tag3 notes",
-              "order": 0,
-              "score": 0,
-              "dictionary": "Test Dictionary 2",
-              "redundant": false
-            },
-            {
-              "name": "tag4",
-              "category": "category4",
-              "notes": "tag4 notes",
+              "name": "E1",
+              "category": "default",
+              "notes": "example tag 1",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
               "redundant": false
             },
             {
-              "name": "tag5",
-              "category": "category5",
-              "notes": "tag5 notes",
+              "name": "P",
+              "category": "popular",
+              "notes": "popular term",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -18762,27 +16688,18 @@
               "reading": "うつ",
               "termTags": [
                 {
-                  "name": "tag3",
-                  "category": "category3",
-                  "notes": "tag3 notes",
-                  "order": 0,
-                  "score": 0,
-                  "dictionary": "Test Dictionary 2",
-                  "redundant": false
-                },
-                {
-                  "name": "tag4",
-                  "category": "category4",
-                  "notes": "tag4 notes",
+                  "name": "E2",
+                  "category": "default",
+                  "notes": "example tag 2",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
                   "redundant": false
                 },
                 {
-                  "name": "tag5",
-                  "category": "category5",
-                  "notes": "tag5 notes",
+                  "name": "P",
+                  "category": "popular",
+                  "notes": "popular term",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
@@ -18835,23 +16752,14 @@
             }
           ],
           "glossary": [
-            "definition7",
-            "definition8"
+            "utsu definition 3",
+            "utsu definition 4"
           ],
           "definitionTags": [
             {
-              "name": "tag1",
-              "category": "category1",
-              "notes": "tag1 notes",
-              "order": 0,
-              "score": 0,
-              "dictionary": "Test Dictionary 2",
-              "redundant": false
-            },
-            {
-              "name": "tag2",
-              "category": "category2",
-              "notes": "tag2 notes",
+              "name": "vt",
+              "category": "partOfSpeech",
+              "notes": "transitive verb",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -18860,27 +16768,18 @@
           ],
           "termTags": [
             {
-              "name": "tag3",
-              "category": "category3",
-              "notes": "tag3 notes",
-              "order": 0,
-              "score": 0,
-              "dictionary": "Test Dictionary 2",
-              "redundant": false
-            },
-            {
-              "name": "tag4",
-              "category": "category4",
-              "notes": "tag4 notes",
+              "name": "E2",
+              "category": "default",
+              "notes": "example tag 2",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
               "redundant": false
             },
             {
-              "name": "tag5",
-              "category": "category5",
-              "notes": "tag5 notes",
+              "name": "P",
+              "category": "popular",
+              "notes": "popular term",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -18994,27 +16893,18 @@
               "reading": "ぶつ",
               "termTags": [
                 {
-                  "name": "tag3",
-                  "category": "category3",
-                  "notes": "tag3 notes",
-                  "order": 0,
-                  "score": 0,
-                  "dictionary": "Test Dictionary 2",
-                  "redundant": false
-                },
-                {
-                  "name": "tag4",
-                  "category": "category4",
-                  "notes": "tag4 notes",
+                  "name": "E2",
+                  "category": "default",
+                  "notes": "example tag 2",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
                   "redundant": false
                 },
                 {
-                  "name": "tag5",
-                  "category": "category5",
-                  "notes": "tag5 notes",
+                  "name": "P",
+                  "category": "popular",
+                  "notes": "popular term",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
@@ -19067,23 +16957,14 @@
             }
           ],
           "glossary": [
-            "definition11",
-            "definition12"
+            "butsu definition 3",
+            "butsu definition 4"
           ],
           "definitionTags": [
             {
-              "name": "tag1",
-              "category": "category1",
-              "notes": "tag1 notes",
-              "order": 0,
-              "score": 0,
-              "dictionary": "Test Dictionary 2",
-              "redundant": false
-            },
-            {
-              "name": "tag2",
-              "category": "category2",
-              "notes": "tag2 notes",
+              "name": "vt",
+              "category": "partOfSpeech",
+              "notes": "transitive verb",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -19092,27 +16973,18 @@
           ],
           "termTags": [
             {
-              "name": "tag3",
-              "category": "category3",
-              "notes": "tag3 notes",
-              "order": 0,
-              "score": 0,
-              "dictionary": "Test Dictionary 2",
-              "redundant": false
-            },
-            {
-              "name": "tag4",
-              "category": "category4",
-              "notes": "tag4 notes",
+              "name": "E2",
+              "category": "default",
+              "notes": "example tag 2",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
               "redundant": false
             },
             {
-              "name": "tag5",
-              "category": "category5",
-              "notes": "tag5 notes",
+              "name": "P",
+              "category": "popular",
+              "notes": "popular term",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -19224,27 +17096,9 @@
               "reading": "だ",
               "termTags": [
                 {
-                  "name": "tag3",
-                  "category": "category3",
-                  "notes": "tag3 notes",
-                  "order": 0,
-                  "score": 0,
-                  "dictionary": "Test Dictionary 2",
-                  "redundant": false
-                },
-                {
-                  "name": "tag4",
-                  "category": "category4",
-                  "notes": "tag4 notes",
-                  "order": 0,
-                  "score": 0,
-                  "dictionary": "Test Dictionary 2",
-                  "redundant": false
-                },
-                {
-                  "name": "tag5",
-                  "category": "category5",
-                  "notes": "tag5 notes",
+                  "name": "E1",
+                  "category": "default",
+                  "notes": "example tag 1",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
@@ -19287,27 +17141,20 @@
                 }
               ],
               "termFrequency": "normal",
-              "wordClasses": []
+              "wordClasses": [
+                "n"
+              ]
             }
           ],
           "glossary": [
-            "definition1",
-            "definition2"
+            "da definition 1",
+            "da definition 2"
           ],
           "definitionTags": [
             {
-              "name": "tag1",
-              "category": "category1",
-              "notes": "tag1 notes",
-              "order": 0,
-              "score": 0,
-              "dictionary": "Test Dictionary 2",
-              "redundant": false
-            },
-            {
-              "name": "tag2",
-              "category": "category2",
-              "notes": "tag2 notes",
+              "name": "n",
+              "category": "partOfSpeech",
+              "notes": "noun",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -19316,27 +17163,9 @@
           ],
           "termTags": [
             {
-              "name": "tag3",
-              "category": "category3",
-              "notes": "tag3 notes",
-              "order": 0,
-              "score": 0,
-              "dictionary": "Test Dictionary 2",
-              "redundant": false
-            },
-            {
-              "name": "tag4",
-              "category": "category4",
-              "notes": "tag4 notes",
-              "order": 0,
-              "score": 0,
-              "dictionary": "Test Dictionary 2",
-              "redundant": false
-            },
-            {
-              "name": "tag5",
-              "category": "category5",
-              "notes": "tag5 notes",
+              "name": "E1",
+              "category": "default",
+              "notes": "example tag 1",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -19444,27 +17273,9 @@
               "reading": "ダース",
               "termTags": [
                 {
-                  "name": "tag3",
-                  "category": "category3",
-                  "notes": "tag3 notes",
-                  "order": 0,
-                  "score": 0,
-                  "dictionary": "Test Dictionary 2",
-                  "redundant": false
-                },
-                {
-                  "name": "tag4",
-                  "category": "category4",
-                  "notes": "tag4 notes",
-                  "order": 0,
-                  "score": 0,
-                  "dictionary": "Test Dictionary 2",
-                  "redundant": false
-                },
-                {
-                  "name": "tag5",
-                  "category": "category5",
-                  "notes": "tag5 notes",
+                  "name": "E1",
+                  "category": "default",
+                  "notes": "example tag 1",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
@@ -19507,27 +17318,29 @@
                 }
               ],
               "termFrequency": "normal",
-              "wordClasses": []
+              "wordClasses": [
+                "n"
+              ]
             }
           ],
           "glossary": [
-            "definition3",
-            "definition4"
+            "daasu definition 1",
+            "daasu definition 2"
           ],
           "definitionTags": [
             {
-              "name": "tag1",
-              "category": "category1",
-              "notes": "tag1 notes",
+              "name": "abbr",
+              "category": "default",
+              "notes": "abbreviation",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
               "redundant": false
             },
             {
-              "name": "tag2",
-              "category": "category2",
-              "notes": "tag2 notes",
+              "name": "n",
+              "category": "partOfSpeech",
+              "notes": "noun",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -19536,27 +17349,9 @@
           ],
           "termTags": [
             {
-              "name": "tag3",
-              "category": "category3",
-              "notes": "tag3 notes",
-              "order": 0,
-              "score": 0,
-              "dictionary": "Test Dictionary 2",
-              "redundant": false
-            },
-            {
-              "name": "tag4",
-              "category": "category4",
-              "notes": "tag4 notes",
-              "order": 0,
-              "score": 0,
-              "dictionary": "Test Dictionary 2",
-              "redundant": false
-            },
-            {
-              "name": "tag5",
-              "category": "category5",
-              "notes": "tag5 notes",
+              "name": "E1",
+              "category": "default",
+              "notes": "example tag 1",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -19671,9 +17466,18 @@
               "reading": "よむ",
               "termTags": [
                 {
-                  "name": "vt",
-                  "category": "partOfSpeech",
-                  "notes": "transitive verb",
+                  "name": "E1",
+                  "category": "default",
+                  "notes": "example tag 1",
+                  "order": 0,
+                  "score": 0,
+                  "dictionary": "Test Dictionary 2",
+                  "redundant": false
+                },
+                {
+                  "name": "P",
+                  "category": "popular",
+                  "notes": "popular term",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
@@ -19703,9 +17507,9 @@
           ],
           "definitionTags": [
             {
-              "name": "popular",
-              "category": "popular",
-              "notes": "popular term",
+              "name": "vt",
+              "category": "partOfSpeech",
+              "notes": "transitive verb",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -19714,9 +17518,18 @@
           ],
           "termTags": [
             {
-              "name": "vt",
-              "category": "partOfSpeech",
-              "notes": "transitive verb",
+              "name": "E1",
+              "category": "default",
+              "notes": "example tag 1",
+              "order": 0,
+              "score": 0,
+              "dictionary": "Test Dictionary 2",
+              "redundant": false
+            },
+            {
+              "name": "P",
+              "category": "popular",
+              "notes": "popular term",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -19804,7 +17617,26 @@
               "sourceTerm": "つよみ",
               "expression": "強み",
               "reading": "つよみ",
-              "termTags": [],
+              "termTags": [
+                {
+                  "name": "E1",
+                  "category": "default",
+                  "notes": "example tag 1",
+                  "order": 0,
+                  "score": 0,
+                  "dictionary": "Test Dictionary 2",
+                  "redundant": false
+                },
+                {
+                  "name": "P",
+                  "category": "popular",
+                  "notes": "popular term",
+                  "order": 0,
+                  "score": 0,
+                  "dictionary": "Test Dictionary 2",
+                  "redundant": false
+                }
+              ],
               "frequencies": [],
               "pitches": [],
               "furiganaSegments": [
@@ -19828,7 +17660,27 @@
           ],
           "definitionTags": [
             {
-              "name": "popular",
+              "name": "n",
+              "category": "partOfSpeech",
+              "notes": "noun",
+              "order": 0,
+              "score": 0,
+              "dictionary": "Test Dictionary 2",
+              "redundant": false
+            }
+          ],
+          "termTags": [
+            {
+              "name": "E1",
+              "category": "default",
+              "notes": "example tag 1",
+              "order": 0,
+              "score": 0,
+              "dictionary": "Test Dictionary 2",
+              "redundant": false
+            },
+            {
+              "name": "P",
               "category": "popular",
               "notes": "popular term",
               "order": 0,
@@ -19837,7 +17689,6 @@
               "redundant": false
             }
           ],
-          "termTags": [],
           "frequencies": [],
           "pitches": [],
           "sourceTermExactMatchCount": 0,
@@ -19923,9 +17774,18 @@
               "reading": "よむ",
               "termTags": [
                 {
-                  "name": "vt",
-                  "category": "partOfSpeech",
-                  "notes": "transitive verb",
+                  "name": "E1",
+                  "category": "default",
+                  "notes": "example tag 1",
+                  "order": 0,
+                  "score": 0,
+                  "dictionary": "Test Dictionary 2",
+                  "redundant": false
+                },
+                {
+                  "name": "P",
+                  "category": "popular",
+                  "notes": "popular term",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
@@ -19955,9 +17815,9 @@
           ],
           "definitionTags": [
             {
-              "name": "popular",
-              "category": "popular",
-              "notes": "popular term",
+              "name": "vt",
+              "category": "partOfSpeech",
+              "notes": "transitive verb",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -19966,9 +17826,18 @@
           ],
           "termTags": [
             {
-              "name": "vt",
-              "category": "partOfSpeech",
-              "notes": "transitive verb",
+              "name": "E1",
+              "category": "default",
+              "notes": "example tag 1",
+              "order": 0,
+              "score": 0,
+              "dictionary": "Test Dictionary 2",
+              "redundant": false
+            },
+            {
+              "name": "P",
+              "category": "popular",
+              "notes": "popular term",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
@@ -20060,45 +17929,27 @@
               "reading": "うちこむ",
               "termTags": [
                 {
-                  "name": "tag3",
-                  "category": "category3",
-                  "notes": "tag3 notes",
-                  "order": 0,
-                  "score": 0,
-                  "dictionary": "Test Dictionary 2",
-                  "redundant": false
-                },
-                {
-                  "name": "tag4",
-                  "category": "category4",
-                  "notes": "tag4 notes",
-                  "order": 0,
-                  "score": 0,
-                  "dictionary": "Test Dictionary 2",
-                  "redundant": false
-                },
-                {
-                  "name": "tag5",
-                  "category": "category5",
-                  "notes": "tag5 notes",
+                  "name": "E1",
+                  "category": "default",
+                  "notes": "example tag 1",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
                   "redundant": false
                 },
                 {
-                  "name": "tag6",
+                  "name": "E2",
                   "category": "default",
-                  "notes": "",
+                  "notes": "example tag 2",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
                   "redundant": false
                 },
                 {
-                  "name": "tag7",
-                  "category": "default",
-                  "notes": "",
+                  "name": "P",
+                  "category": "popular",
+                  "notes": "popular term",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
@@ -20185,27 +18036,27 @@
               "reading": "ぶちこむ",
               "termTags": [
                 {
-                  "name": "tag3",
-                  "category": "category3",
-                  "notes": "tag3 notes",
+                  "name": "E1",
+                  "category": "default",
+                  "notes": "example tag 1",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
                   "redundant": false
                 },
                 {
-                  "name": "tag4",
-                  "category": "category4",
-                  "notes": "tag4 notes",
+                  "name": "E2",
+                  "category": "default",
+                  "notes": "example tag 2",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
                   "redundant": false
                 },
                 {
-                  "name": "tag5",
-                  "category": "category5",
-                  "notes": "tag5 notes",
+                  "name": "P",
+                  "category": "popular",
+                  "notes": "popular term",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
@@ -20292,23 +18143,14 @@
               "sequence": 4,
               "dictionary": "Test Dictionary 2",
               "glossary": [
-                "definition13",
-                "definition14"
+                "uchikomu definition 1",
+                "uchikomu definition 2"
               ],
               "definitionTags": [
                 {
-                  "name": "tag1",
-                  "category": "category1",
-                  "notes": "tag1 notes",
-                  "order": 0,
-                  "score": 0,
-                  "dictionary": "Test Dictionary 2",
-                  "redundant": false
-                },
-                {
-                  "name": "tag2",
-                  "category": "category2",
-                  "notes": "tag2 notes",
+                  "name": "vt",
+                  "category": "partOfSpeech",
+                  "notes": "transitive verb",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
@@ -20323,27 +18165,18 @@
               "sequence": 4,
               "dictionary": "Test Dictionary 2",
               "glossary": [
-                "definition17",
-                "definition18"
+                "buchikomu definition 1",
+                "buchikomu definition 2"
               ],
               "definitionTags": [
                 {
-                  "name": "tag1",
-                  "category": "category1",
-                  "notes": "tag1 notes",
-                  "order": 0,
-                  "score": 0,
-                  "dictionary": "Test Dictionary 2",
-                  "redundant": false
-                },
-                {
-                  "name": "tag2",
-                  "category": "category2",
-                  "notes": "tag2 notes",
+                  "name": "vt",
+                  "category": "partOfSpeech",
+                  "notes": "transitive verb",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
-                  "redundant": false
+                  "redundant": true
                 }
               ],
               "only": [
@@ -20354,27 +18187,18 @@
               "sequence": 4,
               "dictionary": "Test Dictionary 2",
               "glossary": [
-                "definition15",
-                "definition16"
+                "uchikomu definition 3",
+                "uchikomu definition 4"
               ],
               "definitionTags": [
                 {
-                  "name": "tag1",
-                  "category": "category1",
-                  "notes": "tag1 notes",
-                  "order": 0,
-                  "score": 0,
-                  "dictionary": "Test Dictionary 2",
-                  "redundant": false
-                },
-                {
-                  "name": "tag2",
-                  "category": "category2",
-                  "notes": "tag2 notes",
+                  "name": "vt",
+                  "category": "partOfSpeech",
+                  "notes": "transitive verb",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
-                  "redundant": false
+                  "redundant": true
                 }
               ],
               "only": [
@@ -20385,27 +18209,18 @@
               "sequence": 4,
               "dictionary": "Test Dictionary 2",
               "glossary": [
-                "definition19",
-                "definition20"
+                "buchikomu definition 3",
+                "buchikomu definition 4"
               ],
               "definitionTags": [
                 {
-                  "name": "tag1",
-                  "category": "category1",
-                  "notes": "tag1 notes",
-                  "order": 0,
-                  "score": 0,
-                  "dictionary": "Test Dictionary 2",
-                  "redundant": false
-                },
-                {
-                  "name": "tag2",
-                  "category": "category2",
-                  "notes": "tag2 notes",
+                  "name": "vt",
+                  "category": "partOfSpeech",
+                  "notes": "transitive verb",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
-                  "redundant": false
+                  "redundant": true
                 }
               ],
               "only": [
@@ -20636,27 +18451,27 @@
               "reading": "うつ",
               "termTags": [
                 {
-                  "name": "tag3",
-                  "category": "category3",
-                  "notes": "tag3 notes",
+                  "name": "E1",
+                  "category": "default",
+                  "notes": "example tag 1",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
                   "redundant": false
                 },
                 {
-                  "name": "tag4",
-                  "category": "category4",
-                  "notes": "tag4 notes",
+                  "name": "E2",
+                  "category": "default",
+                  "notes": "example tag 2",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
                   "redundant": false
                 },
                 {
-                  "name": "tag5",
-                  "category": "category5",
-                  "notes": "tag5 notes",
+                  "name": "P",
+                  "category": "popular",
+                  "notes": "popular term",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
@@ -20713,27 +18528,27 @@
               "reading": "ぶつ",
               "termTags": [
                 {
-                  "name": "tag3",
-                  "category": "category3",
-                  "notes": "tag3 notes",
+                  "name": "E1",
+                  "category": "default",
+                  "notes": "example tag 1",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
                   "redundant": false
                 },
                 {
-                  "name": "tag4",
-                  "category": "category4",
-                  "notes": "tag4 notes",
+                  "name": "E2",
+                  "category": "default",
+                  "notes": "example tag 2",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
                   "redundant": false
                 },
                 {
-                  "name": "tag5",
-                  "category": "category5",
-                  "notes": "tag5 notes",
+                  "name": "P",
+                  "category": "popular",
+                  "notes": "popular term",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
@@ -20790,23 +18605,14 @@
               "sequence": 3,
               "dictionary": "Test Dictionary 2",
               "glossary": [
-                "definition5",
-                "definition6"
+                "utsu definition 1",
+                "utsu definition 2"
               ],
               "definitionTags": [
                 {
-                  "name": "tag1",
-                  "category": "category1",
-                  "notes": "tag1 notes",
-                  "order": 0,
-                  "score": 0,
-                  "dictionary": "Test Dictionary 2",
-                  "redundant": false
-                },
-                {
-                  "name": "tag2",
-                  "category": "category2",
-                  "notes": "tag2 notes",
+                  "name": "vt",
+                  "category": "partOfSpeech",
+                  "notes": "transitive verb",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
@@ -20821,27 +18627,18 @@
               "sequence": 3,
               "dictionary": "Test Dictionary 2",
               "glossary": [
-                "definition9",
-                "definition10"
+                "butsu definition 1",
+                "butsu definition 2"
               ],
               "definitionTags": [
                 {
-                  "name": "tag1",
-                  "category": "category1",
-                  "notes": "tag1 notes",
-                  "order": 0,
-                  "score": 0,
-                  "dictionary": "Test Dictionary 2",
-                  "redundant": false
-                },
-                {
-                  "name": "tag2",
-                  "category": "category2",
-                  "notes": "tag2 notes",
+                  "name": "vt",
+                  "category": "partOfSpeech",
+                  "notes": "transitive verb",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
-                  "redundant": false
+                  "redundant": true
                 }
               ],
               "only": [
@@ -20852,27 +18649,18 @@
               "sequence": 3,
               "dictionary": "Test Dictionary 2",
               "glossary": [
-                "definition7",
-                "definition8"
+                "utsu definition 3",
+                "utsu definition 4"
               ],
               "definitionTags": [
                 {
-                  "name": "tag1",
-                  "category": "category1",
-                  "notes": "tag1 notes",
-                  "order": 0,
-                  "score": 0,
-                  "dictionary": "Test Dictionary 2",
-                  "redundant": false
-                },
-                {
-                  "name": "tag2",
-                  "category": "category2",
-                  "notes": "tag2 notes",
+                  "name": "vt",
+                  "category": "partOfSpeech",
+                  "notes": "transitive verb",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
-                  "redundant": false
+                  "redundant": true
                 }
               ],
               "only": [
@@ -20883,27 +18671,18 @@
               "sequence": 3,
               "dictionary": "Test Dictionary 2",
               "glossary": [
-                "definition11",
-                "definition12"
+                "butsu definition 3",
+                "butsu definition 4"
               ],
               "definitionTags": [
                 {
-                  "name": "tag1",
-                  "category": "category1",
-                  "notes": "tag1 notes",
-                  "order": 0,
-                  "score": 0,
-                  "dictionary": "Test Dictionary 2",
-                  "redundant": false
-                },
-                {
-                  "name": "tag2",
-                  "category": "category2",
-                  "notes": "tag2 notes",
+                  "name": "vt",
+                  "category": "partOfSpeech",
+                  "notes": "transitive verb",
                   "order": 0,
                   "score": 0,
                   "dictionary": "Test Dictionary 2",
-                  "redundant": false
+                  "redundant": true
                 }
               ],
               "only": [
diff --git a/test/data/translator-test-results.json b/test/data/translator-test-results.json
index 5d8e6abd..93a86fa8 100644
--- a/test/data/translator-test-results.json
+++ b/test/data/translator-test-results.json
@@ -17,12 +17,12 @@
         ],
         "tags": [
           {
-            "name": "ktag1",
-            "category": "kcategory1",
+            "name": "K1",
+            "category": "default",
             "order": 0,
             "score": 0,
             "content": [
-              "ktag1 notes"
+              "example kanji tag 1"
             ],
             "dictionaries": [
               "Test Dictionary 2"
@@ -30,12 +30,12 @@
             "redundant": false
           },
           {
-            "name": "ktag2",
-            "category": "kcategory2",
+            "name": "K2",
+            "category": "default",
             "order": 0,
             "score": 0,
             "content": [
-              "ktag2 notes"
+              "example kanji tag 2"
             ],
             "dictionaries": [
               "Test Dictionary 2"
@@ -44,68 +44,66 @@
           }
         ],
         "stats": {
-          "kcategory3": [
+          "class": [
             {
               "name": "kstat1",
-              "category": "kcategory3",
-              "content": "kstat1 notes",
+              "category": "class",
+              "content": "kanji stat 1",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
-              "value": "1"
+              "value": "kanji stat 1 value"
             }
           ],
-          "kcategory4": [
+          "code": [
             {
               "name": "kstat2",
-              "category": "kcategory4",
-              "content": "kstat2 notes",
+              "category": "code",
+              "content": "kanji stat 2",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
-              "value": "2"
+              "value": "kanji stat 2 value"
             }
           ],
-          "kcategory5": [
+          "index": [
             {
               "name": "kstat3",
-              "category": "kcategory5",
-              "content": "kstat3 notes",
+              "category": "index",
+              "content": "kanji stat 3",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
-              "value": "3"
+              "value": "kanji stat 3 value"
             }
           ],
-          "kcategory6": [
+          "misc": [
             {
               "name": "kstat4",
-              "category": "kcategory6",
-              "content": "kstat4 notes",
+              "category": "misc",
+              "content": "kanji stat 4",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
-              "value": "4"
-            }
-          ],
-          "kcategory7": [
+              "value": "kanji stat 4 value"
+            },
             {
               "name": "kstat5",
-              "category": "kcategory7",
-              "content": "kstat5 notes",
+              "category": "misc",
+              "content": "kanji stat 5",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
-              "value": "5"
+              "value": "kanji stat 5 value"
             }
           ]
         },
         "definitions": [
-          "meaning1",
-          "meaning2",
-          "meaning3",
-          "meaning4",
-          "meaning5"
+          "utsu meaning 1",
+          "utsu meaning 2",
+          "utsu meaning 3",
+          "utsu meaning 4",
+          "utsu meaning 5"
         ],
         "frequencies": [
           {
@@ -137,12 +135,12 @@
         ],
         "tags": [
           {
-            "name": "ktag1",
-            "category": "kcategory1",
+            "name": "K1",
+            "category": "default",
             "order": 0,
             "score": 0,
             "content": [
-              "ktag1 notes"
+              "example kanji tag 1"
             ],
             "dictionaries": [
               "Test Dictionary 2"
@@ -150,12 +148,12 @@
             "redundant": false
           },
           {
-            "name": "ktag2",
-            "category": "kcategory2",
+            "name": "K2",
+            "category": "default",
             "order": 0,
             "score": 0,
             "content": [
-              "ktag2 notes"
+              "example kanji tag 2"
             ],
             "dictionaries": [
               "Test Dictionary 2"
@@ -164,68 +162,66 @@
           }
         ],
         "stats": {
-          "kcategory3": [
+          "class": [
             {
               "name": "kstat1",
-              "category": "kcategory3",
-              "content": "kstat1 notes",
+              "category": "class",
+              "content": "kanji stat 1",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
-              "value": "1"
+              "value": "kanji stat 1 value"
             }
           ],
-          "kcategory4": [
+          "code": [
             {
               "name": "kstat2",
-              "category": "kcategory4",
-              "content": "kstat2 notes",
+              "category": "code",
+              "content": "kanji stat 2",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
-              "value": "2"
+              "value": "kanji stat 2 value"
             }
           ],
-          "kcategory5": [
+          "index": [
             {
               "name": "kstat3",
-              "category": "kcategory5",
-              "content": "kstat3 notes",
+              "category": "index",
+              "content": "kanji stat 3",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
-              "value": "3"
+              "value": "kanji stat 3 value"
             }
           ],
-          "kcategory6": [
+          "misc": [
             {
               "name": "kstat4",
-              "category": "kcategory6",
-              "content": "kstat4 notes",
+              "category": "misc",
+              "content": "kanji stat 4",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
-              "value": "4"
-            }
-          ],
-          "kcategory7": [
+              "value": "kanji stat 4 value"
+            },
             {
               "name": "kstat5",
-              "category": "kcategory7",
-              "content": "kstat5 notes",
+              "category": "misc",
+              "content": "kanji stat 5",
               "order": 0,
               "score": 0,
               "dictionary": "Test Dictionary 2",
-              "value": "5"
+              "value": "kanji stat 5 value"
             }
           ]
         },
         "definitions": [
-          "meaning1",
-          "meaning2",
-          "meaning3",
-          "meaning4",
-          "meaning5"
+          "komu meaning 1",
+          "komu meaning 2",
+          "komu meaning 3",
+          "komu meaning 4",
+          "komu meaning 5"
         ],
         "frequencies": [
           {
@@ -273,38 +269,12 @@
             ],
             "tags": [
               {
-                "name": "tag3",
-                "category": "category3",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag3 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag4",
-                "category": "category4",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag4 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag5",
-                "category": "category5",
+                "name": "E1",
+                "category": "default",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag5 notes"
+                  "example tag 1"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -312,7 +282,9 @@
                 "redundant": false
               }
             ],
-            "wordClasses": []
+            "wordClasses": [
+              "n"
+            ]
           }
         ],
         "definitions": [
@@ -328,25 +300,12 @@
             "isPrimary": true,
             "tags": [
               {
-                "name": "tag1",
-                "category": "category1",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag1 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag2",
-                "category": "category2",
+                "name": "n",
+                "category": "partOfSpeech",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag2 notes"
+                  "noun"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -355,8 +314,8 @@
               }
             ],
             "entries": [
-              "definition1",
-              "definition2"
+              "da definition 1",
+              "da definition 2"
             ]
           }
         ],
@@ -407,38 +366,12 @@
             ],
             "tags": [
               {
-                "name": "tag3",
-                "category": "category3",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag3 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag4",
-                "category": "category4",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag4 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag5",
-                "category": "category5",
+                "name": "E1",
+                "category": "default",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag5 notes"
+                  "example tag 1"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -446,7 +379,9 @@
                 "redundant": false
               }
             ],
-            "wordClasses": []
+            "wordClasses": [
+              "n"
+            ]
           }
         ],
         "definitions": [
@@ -462,12 +397,12 @@
             "isPrimary": true,
             "tags": [
               {
-                "name": "tag1",
-                "category": "category1",
+                "name": "abbr",
+                "category": "default",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag1 notes"
+                  "abbreviation"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -475,12 +410,12 @@
                 "redundant": false
               },
               {
-                "name": "tag2",
-                "category": "category2",
+                "name": "n",
+                "category": "partOfSpeech",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag2 notes"
+                  "noun"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -489,8 +424,8 @@
               }
             ],
             "entries": [
-              "definition3",
-              "definition4"
+              "daasu definition 1",
+              "daasu definition 2"
             ]
           }
         ],
@@ -547,25 +482,12 @@
             ],
             "tags": [
               {
-                "name": "tag3",
-                "category": "category3",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag3 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag4",
-                "category": "category4",
+                "name": "E1",
+                "category": "default",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag4 notes"
+                  "example tag 1"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -573,12 +495,12 @@
                 "redundant": false
               },
               {
-                "name": "tag5",
-                "category": "category5",
+                "name": "P",
+                "category": "popular",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag5 notes"
+                  "popular term"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -604,25 +526,12 @@
             "isPrimary": true,
             "tags": [
               {
-                "name": "tag1",
-                "category": "category1",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag1 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag2",
-                "category": "category2",
+                "name": "vt",
+                "category": "partOfSpeech",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag2 notes"
+                  "transitive verb"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -631,8 +540,8 @@
               }
             ],
             "entries": [
-              "definition5",
-              "definition6"
+              "utsu definition 1",
+              "utsu definition 2"
             ]
           }
         ],
@@ -683,25 +592,12 @@
             ],
             "tags": [
               {
-                "name": "tag3",
-                "category": "category3",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag3 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag4",
-                "category": "category4",
+                "name": "E1",
+                "category": "default",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag4 notes"
+                  "example tag 1"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -709,12 +605,12 @@
                 "redundant": false
               },
               {
-                "name": "tag5",
-                "category": "category5",
+                "name": "P",
+                "category": "popular",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag5 notes"
+                  "popular term"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -740,25 +636,12 @@
             "isPrimary": true,
             "tags": [
               {
-                "name": "tag1",
-                "category": "category1",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag1 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag2",
-                "category": "category2",
+                "name": "vt",
+                "category": "partOfSpeech",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag2 notes"
+                  "transitive verb"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -767,8 +650,8 @@
               }
             ],
             "entries": [
-              "definition9",
-              "definition10"
+              "butsu definition 1",
+              "butsu definition 2"
             ]
           }
         ],
@@ -819,25 +702,12 @@
             ],
             "tags": [
               {
-                "name": "tag3",
-                "category": "category3",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag3 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag4",
-                "category": "category4",
+                "name": "E2",
+                "category": "default",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag4 notes"
+                  "example tag 2"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -845,12 +715,12 @@
                 "redundant": false
               },
               {
-                "name": "tag5",
-                "category": "category5",
+                "name": "P",
+                "category": "popular",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag5 notes"
+                  "popular term"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -876,25 +746,12 @@
             "isPrimary": true,
             "tags": [
               {
-                "name": "tag1",
-                "category": "category1",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag1 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag2",
-                "category": "category2",
+                "name": "vt",
+                "category": "partOfSpeech",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag2 notes"
+                  "transitive verb"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -903,8 +760,8 @@
               }
             ],
             "entries": [
-              "definition7",
-              "definition8"
+              "utsu definition 3",
+              "utsu definition 4"
             ]
           }
         ],
@@ -955,25 +812,12 @@
             ],
             "tags": [
               {
-                "name": "tag3",
-                "category": "category3",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag3 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag4",
-                "category": "category4",
+                "name": "E2",
+                "category": "default",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag4 notes"
+                  "example tag 2"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -981,12 +825,12 @@
                 "redundant": false
               },
               {
-                "name": "tag5",
-                "category": "category5",
+                "name": "P",
+                "category": "popular",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag5 notes"
+                  "popular term"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -1012,25 +856,12 @@
             "isPrimary": true,
             "tags": [
               {
-                "name": "tag1",
-                "category": "category1",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag1 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag2",
-                "category": "category2",
+                "name": "vt",
+                "category": "partOfSpeech",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag2 notes"
+                  "transitive verb"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -1039,8 +870,8 @@
               }
             ],
             "entries": [
-              "definition11",
-              "definition12"
+              "butsu definition 3",
+              "butsu definition 4"
             ]
           }
         ],
@@ -1091,38 +922,12 @@
             ],
             "tags": [
               {
-                "name": "tag3",
-                "category": "category3",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag3 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag4",
-                "category": "category4",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag4 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag5",
-                "category": "category5",
+                "name": "E1",
+                "category": "default",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag5 notes"
+                  "example tag 1"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -1130,7 +935,9 @@
                 "redundant": false
               }
             ],
-            "wordClasses": []
+            "wordClasses": [
+              "n"
+            ]
           }
         ],
         "definitions": [
@@ -1146,25 +953,12 @@
             "isPrimary": true,
             "tags": [
               {
-                "name": "tag1",
-                "category": "category1",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag1 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag2",
-                "category": "category2",
+                "name": "n",
+                "category": "partOfSpeech",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag2 notes"
+                  "noun"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -1173,8 +967,8 @@
               }
             ],
             "entries": [
-              "definition1",
-              "definition2"
+              "da definition 1",
+              "da definition 2"
             ]
           }
         ],
@@ -1225,38 +1019,12 @@
             ],
             "tags": [
               {
-                "name": "tag3",
-                "category": "category3",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag3 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag4",
-                "category": "category4",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag4 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag5",
-                "category": "category5",
+                "name": "E1",
+                "category": "default",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag5 notes"
+                  "example tag 1"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -1264,7 +1032,9 @@
                 "redundant": false
               }
             ],
-            "wordClasses": []
+            "wordClasses": [
+              "n"
+            ]
           }
         ],
         "definitions": [
@@ -1280,12 +1050,12 @@
             "isPrimary": true,
             "tags": [
               {
-                "name": "tag1",
-                "category": "category1",
+                "name": "abbr",
+                "category": "default",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag1 notes"
+                  "abbreviation"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -1293,12 +1063,12 @@
                 "redundant": false
               },
               {
-                "name": "tag2",
-                "category": "category2",
+                "name": "n",
+                "category": "partOfSpeech",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag2 notes"
+                  "noun"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -1307,8 +1077,8 @@
               }
             ],
             "entries": [
-              "definition3",
-              "definition4"
+              "daasu definition 1",
+              "daasu definition 2"
             ]
           }
         ],
@@ -1365,25 +1135,12 @@
             ],
             "tags": [
               {
-                "name": "tag3",
-                "category": "category3",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag3 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag4",
-                "category": "category4",
+                "name": "E1",
+                "category": "default",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag4 notes"
+                  "example tag 1"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -1391,12 +1148,12 @@
                 "redundant": false
               },
               {
-                "name": "tag5",
-                "category": "category5",
+                "name": "P",
+                "category": "popular",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag5 notes"
+                  "popular term"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -1422,25 +1179,12 @@
             "isPrimary": true,
             "tags": [
               {
-                "name": "tag1",
-                "category": "category1",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag1 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag2",
-                "category": "category2",
+                "name": "vt",
+                "category": "partOfSpeech",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag2 notes"
+                  "transitive verb"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -1449,8 +1193,8 @@
               }
             ],
             "entries": [
-              "definition13",
-              "definition14"
+              "uchikomu definition 1",
+              "uchikomu definition 2"
             ]
           }
         ],
@@ -1519,25 +1263,12 @@
             ],
             "tags": [
               {
-                "name": "tag3",
-                "category": "category3",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag3 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag4",
-                "category": "category4",
+                "name": "E1",
+                "category": "default",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag4 notes"
+                  "example tag 1"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -1545,12 +1276,12 @@
                 "redundant": false
               },
               {
-                "name": "tag5",
-                "category": "category5",
+                "name": "P",
+                "category": "popular",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag5 notes"
+                  "popular term"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -1576,25 +1307,12 @@
             "isPrimary": true,
             "tags": [
               {
-                "name": "tag1",
-                "category": "category1",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag1 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag2",
-                "category": "category2",
+                "name": "vt",
+                "category": "partOfSpeech",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag2 notes"
+                  "transitive verb"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -1603,8 +1321,8 @@
               }
             ],
             "entries": [
-              "definition17",
-              "definition18"
+              "buchikomu definition 1",
+              "buchikomu definition 2"
             ]
           }
         ],
@@ -1673,12 +1391,12 @@
             ],
             "tags": [
               {
-                "name": "tag5",
-                "category": "category5",
+                "name": "E2",
+                "category": "default",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag5 notes"
+                  "example tag 2"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -1686,22 +1404,13 @@
                 "redundant": false
               },
               {
-                "name": "tag6",
-                "category": "default",
+                "name": "P",
+                "category": "popular",
                 "order": 0,
                 "score": 0,
-                "content": [],
-                "dictionaries": [
-                  "Test Dictionary 2"
+                "content": [
+                  "popular term"
                 ],
-                "redundant": false
-              },
-              {
-                "name": "tag7",
-                "category": "default",
-                "order": 0,
-                "score": 0,
-                "content": [],
                 "dictionaries": [
                   "Test Dictionary 2"
                 ],
@@ -1726,25 +1435,12 @@
             "isPrimary": true,
             "tags": [
               {
-                "name": "tag1",
-                "category": "category1",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag1 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag2",
-                "category": "category2",
+                "name": "vt",
+                "category": "partOfSpeech",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag2 notes"
+                  "transitive verb"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -1753,8 +1449,8 @@
               }
             ],
             "entries": [
-              "definition15",
-              "definition16"
+              "uchikomu definition 3",
+              "uchikomu definition 4"
             ]
           }
         ],
@@ -1823,25 +1519,12 @@
             ],
             "tags": [
               {
-                "name": "tag3",
-                "category": "category3",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag3 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag4",
-                "category": "category4",
+                "name": "E2",
+                "category": "default",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag4 notes"
+                  "example tag 2"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -1849,12 +1532,12 @@
                 "redundant": false
               },
               {
-                "name": "tag5",
-                "category": "category5",
+                "name": "P",
+                "category": "popular",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag5 notes"
+                  "popular term"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -1880,25 +1563,12 @@
             "isPrimary": true,
             "tags": [
               {
-                "name": "tag1",
-                "category": "category1",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag1 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag2",
-                "category": "category2",
+                "name": "vt",
+                "category": "partOfSpeech",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag2 notes"
+                  "transitive verb"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -1907,8 +1577,8 @@
               }
             ],
             "entries": [
-              "definition19",
-              "definition20"
+              "buchikomu definition 3",
+              "buchikomu definition 4"
             ]
           }
         ],
@@ -1979,25 +1649,12 @@
             ],
             "tags": [
               {
-                "name": "tag3",
-                "category": "category3",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag3 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag4",
-                "category": "category4",
+                "name": "E1",
+                "category": "default",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag4 notes"
+                  "example tag 1"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -2005,12 +1662,12 @@
                 "redundant": false
               },
               {
-                "name": "tag5",
-                "category": "category5",
+                "name": "P",
+                "category": "popular",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag5 notes"
+                  "popular term"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -2036,25 +1693,12 @@
             "isPrimary": true,
             "tags": [
               {
-                "name": "tag1",
-                "category": "category1",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag1 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag2",
-                "category": "category2",
+                "name": "vt",
+                "category": "partOfSpeech",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag2 notes"
+                  "transitive verb"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -2063,8 +1707,8 @@
               }
             ],
             "entries": [
-              "definition5",
-              "definition6"
+              "utsu definition 1",
+              "utsu definition 2"
             ]
           }
         ],
@@ -2117,25 +1761,12 @@
             ],
             "tags": [
               {
-                "name": "tag3",
-                "category": "category3",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag3 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag4",
-                "category": "category4",
+                "name": "E1",
+                "category": "default",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag4 notes"
+                  "example tag 1"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -2143,12 +1774,12 @@
                 "redundant": false
               },
               {
-                "name": "tag5",
-                "category": "category5",
+                "name": "P",
+                "category": "popular",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag5 notes"
+                  "popular term"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -2174,25 +1805,12 @@
             "isPrimary": true,
             "tags": [
               {
-                "name": "tag1",
-                "category": "category1",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag1 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag2",
-                "category": "category2",
+                "name": "vt",
+                "category": "partOfSpeech",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag2 notes"
+                  "transitive verb"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -2201,8 +1819,8 @@
               }
             ],
             "entries": [
-              "definition9",
-              "definition10"
+              "butsu definition 1",
+              "butsu definition 2"
             ]
           }
         ],
@@ -2255,25 +1873,12 @@
             ],
             "tags": [
               {
-                "name": "tag3",
-                "category": "category3",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag3 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag4",
-                "category": "category4",
+                "name": "E2",
+                "category": "default",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag4 notes"
+                  "example tag 2"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -2281,12 +1886,12 @@
                 "redundant": false
               },
               {
-                "name": "tag5",
-                "category": "category5",
+                "name": "P",
+                "category": "popular",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag5 notes"
+                  "popular term"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -2312,25 +1917,12 @@
             "isPrimary": true,
             "tags": [
               {
-                "name": "tag1",
-                "category": "category1",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag1 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag2",
-                "category": "category2",
+                "name": "vt",
+                "category": "partOfSpeech",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag2 notes"
+                  "transitive verb"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -2339,8 +1931,8 @@
               }
             ],
             "entries": [
-              "definition7",
-              "definition8"
+              "utsu definition 3",
+              "utsu definition 4"
             ]
           }
         ],
@@ -2393,25 +1985,12 @@
             ],
             "tags": [
               {
-                "name": "tag3",
-                "category": "category3",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag3 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag4",
-                "category": "category4",
+                "name": "E2",
+                "category": "default",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag4 notes"
+                  "example tag 2"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -2419,12 +1998,12 @@
                 "redundant": false
               },
               {
-                "name": "tag5",
-                "category": "category5",
+                "name": "P",
+                "category": "popular",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag5 notes"
+                  "popular term"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -2450,25 +2029,12 @@
             "isPrimary": true,
             "tags": [
               {
-                "name": "tag1",
-                "category": "category1",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag1 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag2",
-                "category": "category2",
+                "name": "vt",
+                "category": "partOfSpeech",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag2 notes"
+                  "transitive verb"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -2477,8 +2043,8 @@
               }
             ],
             "entries": [
-              "definition11",
-              "definition12"
+              "butsu definition 3",
+              "butsu definition 4"
             ]
           }
         ],
@@ -2529,38 +2095,12 @@
             ],
             "tags": [
               {
-                "name": "tag3",
-                "category": "category3",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag3 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag4",
-                "category": "category4",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag4 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag5",
-                "category": "category5",
+                "name": "E1",
+                "category": "default",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag5 notes"
+                  "example tag 1"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -2568,7 +2108,9 @@
                 "redundant": false
               }
             ],
-            "wordClasses": []
+            "wordClasses": [
+              "n"
+            ]
           }
         ],
         "definitions": [
@@ -2584,25 +2126,12 @@
             "isPrimary": true,
             "tags": [
               {
-                "name": "tag1",
-                "category": "category1",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag1 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag2",
-                "category": "category2",
+                "name": "n",
+                "category": "partOfSpeech",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag2 notes"
+                  "noun"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -2611,8 +2140,8 @@
               }
             ],
             "entries": [
-              "definition1",
-              "definition2"
+              "da definition 1",
+              "da definition 2"
             ]
           }
         ],
@@ -2663,38 +2192,12 @@
             ],
             "tags": [
               {
-                "name": "tag3",
-                "category": "category3",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag3 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag4",
-                "category": "category4",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag4 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag5",
-                "category": "category5",
+                "name": "E1",
+                "category": "default",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag5 notes"
+                  "example tag 1"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -2702,7 +2205,9 @@
                 "redundant": false
               }
             ],
-            "wordClasses": []
+            "wordClasses": [
+              "n"
+            ]
           }
         ],
         "definitions": [
@@ -2718,12 +2223,12 @@
             "isPrimary": true,
             "tags": [
               {
-                "name": "tag1",
-                "category": "category1",
+                "name": "abbr",
+                "category": "default",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag1 notes"
+                  "abbreviation"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -2731,12 +2236,12 @@
                 "redundant": false
               },
               {
-                "name": "tag2",
-                "category": "category2",
+                "name": "n",
+                "category": "partOfSpeech",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag2 notes"
+                  "noun"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -2745,8 +2250,8 @@
               }
             ],
             "entries": [
-              "definition3",
-              "definition4"
+              "daasu definition 1",
+              "daasu definition 2"
             ]
           }
         ],
@@ -2803,25 +2308,12 @@
             ],
             "tags": [
               {
-                "name": "tag3",
-                "category": "category3",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag3 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag4",
-                "category": "category4",
+                "name": "E1",
+                "category": "default",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag4 notes"
+                  "example tag 1"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -2829,12 +2321,12 @@
                 "redundant": false
               },
               {
-                "name": "tag5",
-                "category": "category5",
+                "name": "P",
+                "category": "popular",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag5 notes"
+                  "popular term"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -2842,7 +2334,9 @@
                 "redundant": false
               }
             ],
-            "wordClasses": []
+            "wordClasses": [
+              "n"
+            ]
           }
         ],
         "definitions": [
@@ -2858,25 +2352,12 @@
             "isPrimary": true,
             "tags": [
               {
-                "name": "tag1",
-                "category": "category1",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag1 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag2",
-                "category": "category2",
+                "name": "n",
+                "category": "partOfSpeech",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag2 notes"
+                  "noun"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -2885,7 +2366,7 @@
               }
             ],
             "entries": [
-              "definition21",
+              "gazou definition 1",
               {
                 "type": "image",
                 "path": "image.gif",
@@ -2893,7 +2374,7 @@
                 "height": 100,
                 "preferredWidth": 350,
                 "preferredHeight": 350,
-                "description": "An image",
+                "description": "gazou definition 2",
                 "pixelated": true
               }
             ]
@@ -2933,38 +2414,12 @@
             ],
             "tags": [
               {
-                "name": "tag3",
-                "category": "category3",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag3 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag4",
-                "category": "category4",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag4 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag5",
-                "category": "category5",
+                "name": "E1",
+                "category": "default",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag5 notes"
+                  "example tag 1"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -2972,7 +2427,9 @@
                 "redundant": false
               }
             ],
-            "wordClasses": []
+            "wordClasses": [
+              "n"
+            ]
           }
         ],
         "definitions": [
@@ -2988,25 +2445,12 @@
             "isPrimary": true,
             "tags": [
               {
-                "name": "tag1",
-                "category": "category1",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag1 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag2",
-                "category": "category2",
+                "name": "n",
+                "category": "partOfSpeech",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag2 notes"
+                  "noun"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -3015,8 +2459,8 @@
               }
             ],
             "entries": [
-              "definition1",
-              "definition2"
+              "da definition 1",
+              "da definition 2"
             ]
           }
         ],
@@ -3073,38 +2517,12 @@
             ],
             "tags": [
               {
-                "name": "tag3",
-                "category": "category3",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag3 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag4",
-                "category": "category4",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag4 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag5",
-                "category": "category5",
+                "name": "E1",
+                "category": "default",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag5 notes"
+                  "example tag 1"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -3112,7 +2530,9 @@
                 "redundant": false
               }
             ],
-            "wordClasses": []
+            "wordClasses": [
+              "n"
+            ]
           }
         ],
         "definitions": [
@@ -3128,12 +2548,12 @@
             "isPrimary": true,
             "tags": [
               {
-                "name": "tag1",
-                "category": "category1",
+                "name": "abbr",
+                "category": "default",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag1 notes"
+                  "abbreviation"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -3141,12 +2561,12 @@
                 "redundant": false
               },
               {
-                "name": "tag2",
-                "category": "category2",
+                "name": "n",
+                "category": "partOfSpeech",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag2 notes"
+                  "noun"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -3155,8 +2575,8 @@
               }
             ],
             "entries": [
-              "definition3",
-              "definition4"
+              "daasu definition 1",
+              "daasu definition 2"
             ]
           }
         ],
@@ -3213,25 +2633,12 @@
             ],
             "tags": [
               {
-                "name": "tag3",
-                "category": "category3",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag3 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag4",
-                "category": "category4",
+                "name": "E1",
+                "category": "default",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag4 notes"
+                  "example tag 1"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -3239,12 +2646,12 @@
                 "redundant": false
               },
               {
-                "name": "tag5",
-                "category": "category5",
+                "name": "P",
+                "category": "popular",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag5 notes"
+                  "popular term"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -3270,25 +2677,12 @@
             "isPrimary": true,
             "tags": [
               {
-                "name": "tag1",
-                "category": "category1",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag1 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag2",
-                "category": "category2",
+                "name": "vt",
+                "category": "partOfSpeech",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag2 notes"
+                  "transitive verb"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -3297,8 +2691,8 @@
               }
             ],
             "entries": [
-              "definition5",
-              "definition6"
+              "utsu definition 1",
+              "utsu definition 2"
             ]
           }
         ],
@@ -3349,25 +2743,12 @@
             ],
             "tags": [
               {
-                "name": "tag3",
-                "category": "category3",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag3 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag4",
-                "category": "category4",
+                "name": "E2",
+                "category": "default",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag4 notes"
+                  "example tag 2"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -3375,12 +2756,12 @@
                 "redundant": false
               },
               {
-                "name": "tag5",
-                "category": "category5",
+                "name": "P",
+                "category": "popular",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag5 notes"
+                  "popular term"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -3406,25 +2787,12 @@
             "isPrimary": true,
             "tags": [
               {
-                "name": "tag1",
-                "category": "category1",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag1 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag2",
-                "category": "category2",
+                "name": "vt",
+                "category": "partOfSpeech",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag2 notes"
+                  "transitive verb"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -3433,8 +2801,8 @@
               }
             ],
             "entries": [
-              "definition7",
-              "definition8"
+              "utsu definition 3",
+              "utsu definition 4"
             ]
           }
         ],
@@ -3491,25 +2859,12 @@
             ],
             "tags": [
               {
-                "name": "tag3",
-                "category": "category3",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag3 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag4",
-                "category": "category4",
+                "name": "E1",
+                "category": "default",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag4 notes"
+                  "example tag 1"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -3517,12 +2872,12 @@
                 "redundant": false
               },
               {
-                "name": "tag5",
-                "category": "category5",
+                "name": "P",
+                "category": "popular",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag5 notes"
+                  "popular term"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -3548,25 +2903,12 @@
             "isPrimary": true,
             "tags": [
               {
-                "name": "tag1",
-                "category": "category1",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag1 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag2",
-                "category": "category2",
+                "name": "vt",
+                "category": "partOfSpeech",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag2 notes"
+                  "transitive verb"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -3575,8 +2917,8 @@
               }
             ],
             "entries": [
-              "definition9",
-              "definition10"
+              "butsu definition 1",
+              "butsu definition 2"
             ]
           }
         ],
@@ -3627,25 +2969,12 @@
             ],
             "tags": [
               {
-                "name": "tag3",
-                "category": "category3",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag3 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag4",
-                "category": "category4",
+                "name": "E2",
+                "category": "default",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag4 notes"
+                  "example tag 2"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -3653,12 +2982,12 @@
                 "redundant": false
               },
               {
-                "name": "tag5",
-                "category": "category5",
+                "name": "P",
+                "category": "popular",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag5 notes"
+                  "popular term"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -3684,25 +3013,12 @@
             "isPrimary": true,
             "tags": [
               {
-                "name": "tag1",
-                "category": "category1",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag1 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag2",
-                "category": "category2",
+                "name": "vt",
+                "category": "partOfSpeech",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag2 notes"
+                  "transitive verb"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -3711,8 +3027,8 @@
               }
             ],
             "entries": [
-              "definition11",
-              "definition12"
+              "butsu definition 3",
+              "butsu definition 4"
             ]
           }
         ],
@@ -3769,25 +3085,12 @@
             ],
             "tags": [
               {
-                "name": "tag3",
-                "category": "category3",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag3 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag4",
-                "category": "category4",
+                "name": "E1",
+                "category": "default",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag4 notes"
+                  "example tag 1"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -3795,12 +3098,12 @@
                 "redundant": false
               },
               {
-                "name": "tag5",
-                "category": "category5",
+                "name": "P",
+                "category": "popular",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag5 notes"
+                  "popular term"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -3826,25 +3129,12 @@
             "isPrimary": true,
             "tags": [
               {
-                "name": "tag1",
-                "category": "category1",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag1 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag2",
-                "category": "category2",
+                "name": "vt",
+                "category": "partOfSpeech",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag2 notes"
+                  "transitive verb"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -3853,8 +3143,8 @@
               }
             ],
             "entries": [
-              "definition13",
-              "definition14"
+              "uchikomu definition 1",
+              "uchikomu definition 2"
             ]
           }
         ],
@@ -3923,12 +3213,12 @@
             ],
             "tags": [
               {
-                "name": "tag5",
-                "category": "category5",
+                "name": "E2",
+                "category": "default",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag5 notes"
+                  "example tag 2"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -3936,22 +3226,13 @@
                 "redundant": false
               },
               {
-                "name": "tag6",
-                "category": "default",
+                "name": "P",
+                "category": "popular",
                 "order": 0,
                 "score": 0,
-                "content": [],
-                "dictionaries": [
-                  "Test Dictionary 2"
+                "content": [
+                  "popular term"
                 ],
-                "redundant": false
-              },
-              {
-                "name": "tag7",
-                "category": "default",
-                "order": 0,
-                "score": 0,
-                "content": [],
                 "dictionaries": [
                   "Test Dictionary 2"
                 ],
@@ -3976,25 +3257,12 @@
             "isPrimary": true,
             "tags": [
               {
-                "name": "tag1",
-                "category": "category1",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag1 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag2",
-                "category": "category2",
+                "name": "vt",
+                "category": "partOfSpeech",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag2 notes"
+                  "transitive verb"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -4003,8 +3271,8 @@
               }
             ],
             "entries": [
-              "definition15",
-              "definition16"
+              "uchikomu definition 3",
+              "uchikomu definition 4"
             ]
           }
         ],
@@ -4075,25 +3343,12 @@
             ],
             "tags": [
               {
-                "name": "tag3",
-                "category": "category3",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag3 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag4",
-                "category": "category4",
+                "name": "E1",
+                "category": "default",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag4 notes"
+                  "example tag 1"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -4101,12 +3356,12 @@
                 "redundant": false
               },
               {
-                "name": "tag5",
-                "category": "category5",
+                "name": "P",
+                "category": "popular",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag5 notes"
+                  "popular term"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -4132,25 +3387,12 @@
             "isPrimary": true,
             "tags": [
               {
-                "name": "tag1",
-                "category": "category1",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag1 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag2",
-                "category": "category2",
+                "name": "vt",
+                "category": "partOfSpeech",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag2 notes"
+                  "transitive verb"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -4159,8 +3401,8 @@
               }
             ],
             "entries": [
-              "definition5",
-              "definition6"
+              "utsu definition 1",
+              "utsu definition 2"
             ]
           }
         ],
@@ -4213,25 +3455,12 @@
             ],
             "tags": [
               {
-                "name": "tag3",
-                "category": "category3",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag3 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag4",
-                "category": "category4",
+                "name": "E2",
+                "category": "default",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag4 notes"
+                  "example tag 2"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -4239,12 +3468,12 @@
                 "redundant": false
               },
               {
-                "name": "tag5",
-                "category": "category5",
+                "name": "P",
+                "category": "popular",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag5 notes"
+                  "popular term"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -4270,25 +3499,12 @@
             "isPrimary": true,
             "tags": [
               {
-                "name": "tag1",
-                "category": "category1",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag1 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag2",
-                "category": "category2",
+                "name": "vt",
+                "category": "partOfSpeech",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag2 notes"
+                  "transitive verb"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -4297,8 +3513,8 @@
               }
             ],
             "entries": [
-              "definition7",
-              "definition8"
+              "utsu definition 3",
+              "utsu definition 4"
             ]
           }
         ],
@@ -4355,25 +3571,12 @@
             ],
             "tags": [
               {
-                "name": "tag3",
-                "category": "category3",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag3 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag4",
-                "category": "category4",
+                "name": "E1",
+                "category": "default",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag4 notes"
+                  "example tag 1"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -4381,12 +3584,12 @@
                 "redundant": false
               },
               {
-                "name": "tag5",
-                "category": "category5",
+                "name": "P",
+                "category": "popular",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag5 notes"
+                  "popular term"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -4412,25 +3615,12 @@
             "isPrimary": true,
             "tags": [
               {
-                "name": "tag1",
-                "category": "category1",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag1 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag2",
-                "category": "category2",
+                "name": "vt",
+                "category": "partOfSpeech",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag2 notes"
+                  "transitive verb"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -4439,8 +3629,8 @@
               }
             ],
             "entries": [
-              "definition17",
-              "definition18"
+              "buchikomu definition 1",
+              "buchikomu definition 2"
             ]
           }
         ],
@@ -4509,25 +3699,12 @@
             ],
             "tags": [
               {
-                "name": "tag3",
-                "category": "category3",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag3 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag4",
-                "category": "category4",
+                "name": "E2",
+                "category": "default",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag4 notes"
+                  "example tag 2"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -4535,12 +3712,12 @@
                 "redundant": false
               },
               {
-                "name": "tag5",
-                "category": "category5",
+                "name": "P",
+                "category": "popular",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag5 notes"
+                  "popular term"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -4566,25 +3743,12 @@
             "isPrimary": true,
             "tags": [
               {
-                "name": "tag1",
-                "category": "category1",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag1 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag2",
-                "category": "category2",
+                "name": "vt",
+                "category": "partOfSpeech",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag2 notes"
+                  "transitive verb"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -4593,8 +3757,8 @@
               }
             ],
             "entries": [
-              "definition19",
-              "definition20"
+              "buchikomu definition 3",
+              "buchikomu definition 4"
             ]
           }
         ],
@@ -4665,25 +3829,12 @@
             ],
             "tags": [
               {
-                "name": "tag3",
-                "category": "category3",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag3 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag4",
-                "category": "category4",
+                "name": "E1",
+                "category": "default",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag4 notes"
+                  "example tag 1"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -4691,12 +3842,12 @@
                 "redundant": false
               },
               {
-                "name": "tag5",
-                "category": "category5",
+                "name": "P",
+                "category": "popular",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag5 notes"
+                  "popular term"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -4722,25 +3873,12 @@
             "isPrimary": true,
             "tags": [
               {
-                "name": "tag1",
-                "category": "category1",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag1 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag2",
-                "category": "category2",
+                "name": "vt",
+                "category": "partOfSpeech",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag2 notes"
+                  "transitive verb"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -4749,8 +3887,8 @@
               }
             ],
             "entries": [
-              "definition9",
-              "definition10"
+              "butsu definition 1",
+              "butsu definition 2"
             ]
           }
         ],
@@ -4803,25 +3941,12 @@
             ],
             "tags": [
               {
-                "name": "tag3",
-                "category": "category3",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag3 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag4",
-                "category": "category4",
+                "name": "E2",
+                "category": "default",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag4 notes"
+                  "example tag 2"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -4829,12 +3954,12 @@
                 "redundant": false
               },
               {
-                "name": "tag5",
-                "category": "category5",
+                "name": "P",
+                "category": "popular",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag5 notes"
+                  "popular term"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -4860,25 +3985,12 @@
             "isPrimary": true,
             "tags": [
               {
-                "name": "tag1",
-                "category": "category1",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag1 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag2",
-                "category": "category2",
+                "name": "vt",
+                "category": "partOfSpeech",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag2 notes"
+                  "transitive verb"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -4887,8 +3999,8 @@
               }
             ],
             "entries": [
-              "definition11",
-              "definition12"
+              "butsu definition 3",
+              "butsu definition 4"
             ]
           }
         ],
@@ -4945,25 +4057,12 @@
             ],
             "tags": [
               {
-                "name": "tag3",
-                "category": "category3",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag3 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag4",
-                "category": "category4",
+                "name": "E1",
+                "category": "default",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag4 notes"
+                  "example tag 1"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -4971,12 +4070,12 @@
                 "redundant": false
               },
               {
-                "name": "tag5",
-                "category": "category5",
+                "name": "P",
+                "category": "popular",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag5 notes"
+                  "popular term"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -4984,7 +4083,9 @@
                 "redundant": false
               }
             ],
-            "wordClasses": []
+            "wordClasses": [
+              "n"
+            ]
           }
         ],
         "definitions": [
@@ -5000,25 +4101,12 @@
             "isPrimary": true,
             "tags": [
               {
-                "name": "tag1",
-                "category": "category1",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag1 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag2",
-                "category": "category2",
+                "name": "n",
+                "category": "partOfSpeech",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag2 notes"
+                  "noun"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -5027,7 +4115,7 @@
               }
             ],
             "entries": [
-              "definition21",
+              "gazou definition 1",
               {
                 "type": "image",
                 "path": "image.gif",
@@ -5035,7 +4123,7 @@
                 "height": 100,
                 "preferredWidth": 350,
                 "preferredHeight": 350,
-                "description": "An image",
+                "description": "gazou definition 2",
                 "pixelated": true
               }
             ]
@@ -5102,8 +4190,8 @@
             "isPrimary": true,
             "tags": [],
             "entries": [
-              "definition13",
-              "definition14"
+              "uchikomu definition 1",
+              "uchikomu definition 2"
             ]
           }
         ],
@@ -5152,8 +4240,8 @@
             "isPrimary": true,
             "tags": [],
             "entries": [
-              "definition17",
-              "definition18"
+              "buchikomu definition 1",
+              "buchikomu definition 2"
             ]
           }
         ],
@@ -5202,8 +4290,8 @@
             "isPrimary": true,
             "tags": [],
             "entries": [
-              "definition15",
-              "definition16"
+              "uchikomu definition 3",
+              "uchikomu definition 4"
             ]
           }
         ],
@@ -5252,8 +4340,8 @@
             "isPrimary": true,
             "tags": [],
             "entries": [
-              "definition19",
-              "definition20"
+              "buchikomu definition 3",
+              "buchikomu definition 4"
             ]
           }
         ],
@@ -5304,8 +4392,8 @@
             "isPrimary": true,
             "tags": [],
             "entries": [
-              "definition5",
-              "definition6"
+              "utsu definition 1",
+              "utsu definition 2"
             ]
           }
         ],
@@ -5356,8 +4444,8 @@
             "isPrimary": true,
             "tags": [],
             "entries": [
-              "definition9",
-              "definition10"
+              "butsu definition 1",
+              "butsu definition 2"
             ]
           }
         ],
@@ -5408,8 +4496,8 @@
             "isPrimary": true,
             "tags": [],
             "entries": [
-              "definition7",
-              "definition8"
+              "utsu definition 3",
+              "utsu definition 4"
             ]
           }
         ],
@@ -5460,8 +4548,8 @@
             "isPrimary": true,
             "tags": [],
             "entries": [
-              "definition11",
-              "definition12"
+              "butsu definition 3",
+              "butsu definition 4"
             ]
           }
         ],
@@ -5492,7 +4580,9 @@
               }
             ],
             "tags": [],
-            "wordClasses": []
+            "wordClasses": [
+              "n"
+            ]
           }
         ],
         "definitions": [
@@ -5508,8 +4598,8 @@
             "isPrimary": true,
             "tags": [],
             "entries": [
-              "definition1",
-              "definition2"
+              "da definition 1",
+              "da definition 2"
             ]
           }
         ],
@@ -5540,7 +4630,9 @@
               }
             ],
             "tags": [],
-            "wordClasses": []
+            "wordClasses": [
+              "n"
+            ]
           }
         ],
         "definitions": [
@@ -5556,8 +4648,8 @@
             "isPrimary": true,
             "tags": [],
             "entries": [
-              "definition3",
-              "definition4"
+              "daasu definition 1",
+              "daasu definition 2"
             ]
           }
         ],
@@ -5595,12 +4687,12 @@
             ],
             "tags": [
               {
-                "name": "tag3",
-                "category": "category3",
+                "name": "E1",
+                "category": "default",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag3 notes"
+                  "example tag 1"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -5608,12 +4700,12 @@
                 "redundant": false
               },
               {
-                "name": "tag4",
-                "category": "category4",
+                "name": "E2",
+                "category": "default",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag4 notes"
+                  "example tag 2"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -5621,35 +4713,13 @@
                 "redundant": false
               },
               {
-                "name": "tag5",
-                "category": "category5",
+                "name": "P",
+                "category": "popular",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag5 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag6",
-                "category": "default",
-                "order": 0,
-                "score": 0,
-                "content": [],
-                "dictionaries": [
-                  "Test Dictionary 2"
+                  "popular term"
                 ],
-                "redundant": false
-              },
-              {
-                "name": "tag7",
-                "category": "default",
-                "order": 0,
-                "score": 0,
-                "content": [],
                 "dictionaries": [
                   "Test Dictionary 2"
                 ],
@@ -5674,25 +4744,12 @@
             "isPrimary": true,
             "tags": [
               {
-                "name": "tag1",
-                "category": "category1",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag1 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag2",
-                "category": "category2",
+                "name": "vt",
+                "category": "partOfSpeech",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag2 notes"
+                  "transitive verb"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -5701,8 +4758,8 @@
               }
             ],
             "entries": [
-              "definition13",
-              "definition14"
+              "uchikomu definition 1",
+              "uchikomu definition 2"
             ]
           },
           {
@@ -5717,35 +4774,22 @@
             "isPrimary": true,
             "tags": [
               {
-                "name": "tag1",
-                "category": "category1",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag1 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag2",
-                "category": "category2",
+                "name": "vt",
+                "category": "partOfSpeech",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag2 notes"
+                  "transitive verb"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
                 ],
-                "redundant": false
+                "redundant": true
               }
             ],
             "entries": [
-              "definition15",
-              "definition16"
+              "uchikomu definition 3",
+              "uchikomu definition 4"
             ]
           }
         ],
@@ -5814,12 +4858,12 @@
             ],
             "tags": [
               {
-                "name": "tag3",
-                "category": "category3",
+                "name": "E1",
+                "category": "default",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag3 notes"
+                  "example tag 1"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -5827,12 +4871,12 @@
                 "redundant": false
               },
               {
-                "name": "tag4",
-                "category": "category4",
+                "name": "E2",
+                "category": "default",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag4 notes"
+                  "example tag 2"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -5840,12 +4884,12 @@
                 "redundant": false
               },
               {
-                "name": "tag5",
-                "category": "category5",
+                "name": "P",
+                "category": "popular",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag5 notes"
+                  "popular term"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -5871,25 +4915,12 @@
             "isPrimary": true,
             "tags": [
               {
-                "name": "tag1",
-                "category": "category1",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag1 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag2",
-                "category": "category2",
+                "name": "vt",
+                "category": "partOfSpeech",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag2 notes"
+                  "transitive verb"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -5898,8 +4929,8 @@
               }
             ],
             "entries": [
-              "definition17",
-              "definition18"
+              "buchikomu definition 1",
+              "buchikomu definition 2"
             ]
           },
           {
@@ -5914,35 +4945,22 @@
             "isPrimary": true,
             "tags": [
               {
-                "name": "tag1",
-                "category": "category1",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag1 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag2",
-                "category": "category2",
+                "name": "vt",
+                "category": "partOfSpeech",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag2 notes"
+                  "transitive verb"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
                 ],
-                "redundant": false
+                "redundant": true
               }
             ],
             "entries": [
-              "definition19",
-              "definition20"
+              "buchikomu definition 3",
+              "buchikomu definition 4"
             ]
           }
         ],
@@ -6013,12 +5031,12 @@
             ],
             "tags": [
               {
-                "name": "tag3",
-                "category": "category3",
+                "name": "E1",
+                "category": "default",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag3 notes"
+                  "example tag 1"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -6026,12 +5044,12 @@
                 "redundant": false
               },
               {
-                "name": "tag4",
-                "category": "category4",
+                "name": "E2",
+                "category": "default",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag4 notes"
+                  "example tag 2"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -6039,12 +5057,12 @@
                 "redundant": false
               },
               {
-                "name": "tag5",
-                "category": "category5",
+                "name": "P",
+                "category": "popular",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag5 notes"
+                  "popular term"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -6070,25 +5088,12 @@
             "isPrimary": true,
             "tags": [
               {
-                "name": "tag1",
-                "category": "category1",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag1 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag2",
-                "category": "category2",
+                "name": "vt",
+                "category": "partOfSpeech",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag2 notes"
+                  "transitive verb"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -6097,8 +5102,8 @@
               }
             ],
             "entries": [
-              "definition5",
-              "definition6"
+              "utsu definition 1",
+              "utsu definition 2"
             ]
           },
           {
@@ -6113,35 +5118,22 @@
             "isPrimary": true,
             "tags": [
               {
-                "name": "tag1",
-                "category": "category1",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag1 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag2",
-                "category": "category2",
+                "name": "vt",
+                "category": "partOfSpeech",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag2 notes"
+                  "transitive verb"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
                 ],
-                "redundant": false
+                "redundant": true
               }
             ],
             "entries": [
-              "definition7",
-              "definition8"
+              "utsu definition 3",
+              "utsu definition 4"
             ]
           }
         ],
@@ -6194,12 +5186,12 @@
             ],
             "tags": [
               {
-                "name": "tag3",
-                "category": "category3",
+                "name": "E1",
+                "category": "default",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag3 notes"
+                  "example tag 1"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -6207,12 +5199,12 @@
                 "redundant": false
               },
               {
-                "name": "tag4",
-                "category": "category4",
+                "name": "E2",
+                "category": "default",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag4 notes"
+                  "example tag 2"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -6220,12 +5212,12 @@
                 "redundant": false
               },
               {
-                "name": "tag5",
-                "category": "category5",
+                "name": "P",
+                "category": "popular",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag5 notes"
+                  "popular term"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -6251,25 +5243,12 @@
             "isPrimary": true,
             "tags": [
               {
-                "name": "tag1",
-                "category": "category1",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag1 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag2",
-                "category": "category2",
+                "name": "vt",
+                "category": "partOfSpeech",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag2 notes"
+                  "transitive verb"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -6278,8 +5257,8 @@
               }
             ],
             "entries": [
-              "definition9",
-              "definition10"
+              "butsu definition 1",
+              "butsu definition 2"
             ]
           },
           {
@@ -6294,35 +5273,22 @@
             "isPrimary": true,
             "tags": [
               {
-                "name": "tag1",
-                "category": "category1",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag1 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag2",
-                "category": "category2",
+                "name": "vt",
+                "category": "partOfSpeech",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag2 notes"
+                  "transitive verb"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
                 ],
-                "redundant": false
+                "redundant": true
               }
             ],
             "entries": [
-              "definition11",
-              "definition12"
+              "butsu definition 3",
+              "butsu definition 4"
             ]
           }
         ],
@@ -6373,38 +5339,12 @@
             ],
             "tags": [
               {
-                "name": "tag3",
-                "category": "category3",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag3 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag4",
-                "category": "category4",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag4 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag5",
-                "category": "category5",
+                "name": "E1",
+                "category": "default",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag5 notes"
+                  "example tag 1"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -6412,7 +5352,9 @@
                 "redundant": false
               }
             ],
-            "wordClasses": []
+            "wordClasses": [
+              "n"
+            ]
           }
         ],
         "definitions": [
@@ -6428,25 +5370,12 @@
             "isPrimary": true,
             "tags": [
               {
-                "name": "tag1",
-                "category": "category1",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag1 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag2",
-                "category": "category2",
+                "name": "n",
+                "category": "partOfSpeech",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag2 notes"
+                  "noun"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -6455,8 +5384,8 @@
               }
             ],
             "entries": [
-              "definition1",
-              "definition2"
+              "da definition 1",
+              "da definition 2"
             ]
           }
         ],
@@ -6507,38 +5436,12 @@
             ],
             "tags": [
               {
-                "name": "tag3",
-                "category": "category3",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag3 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag4",
-                "category": "category4",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag4 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag5",
-                "category": "category5",
+                "name": "E1",
+                "category": "default",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag5 notes"
+                  "example tag 1"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -6546,7 +5449,9 @@
                 "redundant": false
               }
             ],
-            "wordClasses": []
+            "wordClasses": [
+              "n"
+            ]
           }
         ],
         "definitions": [
@@ -6562,12 +5467,12 @@
             "isPrimary": true,
             "tags": [
               {
-                "name": "tag1",
-                "category": "category1",
+                "name": "abbr",
+                "category": "default",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag1 notes"
+                  "abbreviation"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -6575,12 +5480,12 @@
                 "redundant": false
               },
               {
-                "name": "tag2",
-                "category": "category2",
+                "name": "n",
+                "category": "partOfSpeech",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag2 notes"
+                  "noun"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -6589,8 +5494,8 @@
               }
             ],
             "entries": [
-              "definition3",
-              "definition4"
+              "daasu definition 1",
+              "daasu definition 2"
             ]
           }
         ],
@@ -6647,12 +5552,12 @@
             ],
             "tags": [
               {
-                "name": "tag3",
-                "category": "category3",
+                "name": "E1",
+                "category": "default",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag3 notes"
+                  "example tag 1"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -6660,12 +5565,12 @@
                 "redundant": false
               },
               {
-                "name": "tag4",
-                "category": "category4",
+                "name": "E2",
+                "category": "default",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag4 notes"
+                  "example tag 2"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -6673,35 +5578,13 @@
                 "redundant": false
               },
               {
-                "name": "tag5",
-                "category": "category5",
+                "name": "P",
+                "category": "popular",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag5 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag6",
-                "category": "default",
-                "order": 0,
-                "score": 0,
-                "content": [],
-                "dictionaries": [
-                  "Test Dictionary 2"
+                  "popular term"
                 ],
-                "redundant": false
-              },
-              {
-                "name": "tag7",
-                "category": "default",
-                "order": 0,
-                "score": 0,
-                "content": [],
                 "dictionaries": [
                   "Test Dictionary 2"
                 ],
@@ -6726,12 +5609,12 @@
             ],
             "tags": [
               {
-                "name": "tag3",
-                "category": "category3",
+                "name": "E1",
+                "category": "default",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag3 notes"
+                  "example tag 1"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -6739,12 +5622,12 @@
                 "redundant": false
               },
               {
-                "name": "tag4",
-                "category": "category4",
+                "name": "E2",
+                "category": "default",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag4 notes"
+                  "example tag 2"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -6752,12 +5635,12 @@
                 "redundant": false
               },
               {
-                "name": "tag5",
-                "category": "category5",
+                "name": "P",
+                "category": "popular",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag5 notes"
+                  "popular term"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -6783,25 +5666,12 @@
             "isPrimary": true,
             "tags": [
               {
-                "name": "tag1",
-                "category": "category1",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag1 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag2",
-                "category": "category2",
+                "name": "vt",
+                "category": "partOfSpeech",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag2 notes"
+                  "transitive verb"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -6810,8 +5680,8 @@
               }
             ],
             "entries": [
-              "definition13",
-              "definition14"
+              "uchikomu definition 1",
+              "uchikomu definition 2"
             ]
           },
           {
@@ -6826,35 +5696,22 @@
             "isPrimary": true,
             "tags": [
               {
-                "name": "tag1",
-                "category": "category1",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag1 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag2",
-                "category": "category2",
+                "name": "vt",
+                "category": "partOfSpeech",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag2 notes"
+                  "transitive verb"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
                 ],
-                "redundant": false
+                "redundant": true
               }
             ],
             "entries": [
-              "definition17",
-              "definition18"
+              "buchikomu definition 1",
+              "buchikomu definition 2"
             ]
           },
           {
@@ -6869,35 +5726,22 @@
             "isPrimary": true,
             "tags": [
               {
-                "name": "tag1",
-                "category": "category1",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag1 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag2",
-                "category": "category2",
+                "name": "vt",
+                "category": "partOfSpeech",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag2 notes"
+                  "transitive verb"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
                 ],
-                "redundant": false
+                "redundant": true
               }
             ],
             "entries": [
-              "definition15",
-              "definition16"
+              "uchikomu definition 3",
+              "uchikomu definition 4"
             ]
           },
           {
@@ -6912,35 +5756,22 @@
             "isPrimary": true,
             "tags": [
               {
-                "name": "tag1",
-                "category": "category1",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag1 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag2",
-                "category": "category2",
+                "name": "vt",
+                "category": "partOfSpeech",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag2 notes"
+                  "transitive verb"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
                 ],
-                "redundant": false
+                "redundant": true
               }
             ],
             "entries": [
-              "definition19",
-              "definition20"
+              "buchikomu definition 3",
+              "buchikomu definition 4"
             ]
           }
         ],
@@ -7046,12 +5877,12 @@
             ],
             "tags": [
               {
-                "name": "tag3",
-                "category": "category3",
+                "name": "E1",
+                "category": "default",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag3 notes"
+                  "example tag 1"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -7059,12 +5890,12 @@
                 "redundant": false
               },
               {
-                "name": "tag4",
-                "category": "category4",
+                "name": "E2",
+                "category": "default",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag4 notes"
+                  "example tag 2"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -7072,12 +5903,12 @@
                 "redundant": false
               },
               {
-                "name": "tag5",
-                "category": "category5",
+                "name": "P",
+                "category": "popular",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag5 notes"
+                  "popular term"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -7103,12 +5934,12 @@
             ],
             "tags": [
               {
-                "name": "tag3",
-                "category": "category3",
+                "name": "E1",
+                "category": "default",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag3 notes"
+                  "example tag 1"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -7116,12 +5947,12 @@
                 "redundant": false
               },
               {
-                "name": "tag4",
-                "category": "category4",
+                "name": "E2",
+                "category": "default",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag4 notes"
+                  "example tag 2"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -7129,12 +5960,12 @@
                 "redundant": false
               },
               {
-                "name": "tag5",
-                "category": "category5",
+                "name": "P",
+                "category": "popular",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag5 notes"
+                  "popular term"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -7160,25 +5991,12 @@
             "isPrimary": true,
             "tags": [
               {
-                "name": "tag1",
-                "category": "category1",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag1 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag2",
-                "category": "category2",
+                "name": "vt",
+                "category": "partOfSpeech",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag2 notes"
+                  "transitive verb"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -7187,8 +6005,8 @@
               }
             ],
             "entries": [
-              "definition5",
-              "definition6"
+              "utsu definition 1",
+              "utsu definition 2"
             ]
           },
           {
@@ -7203,35 +6021,22 @@
             "isPrimary": true,
             "tags": [
               {
-                "name": "tag1",
-                "category": "category1",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag1 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag2",
-                "category": "category2",
+                "name": "vt",
+                "category": "partOfSpeech",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag2 notes"
+                  "transitive verb"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
                 ],
-                "redundant": false
+                "redundant": true
               }
             ],
             "entries": [
-              "definition9",
-              "definition10"
+              "butsu definition 1",
+              "butsu definition 2"
             ]
           },
           {
@@ -7246,35 +6051,22 @@
             "isPrimary": true,
             "tags": [
               {
-                "name": "tag1",
-                "category": "category1",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag1 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag2",
-                "category": "category2",
+                "name": "vt",
+                "category": "partOfSpeech",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag2 notes"
+                  "transitive verb"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
                 ],
-                "redundant": false
+                "redundant": true
               }
             ],
             "entries": [
-              "definition7",
-              "definition8"
+              "utsu definition 3",
+              "utsu definition 4"
             ]
           },
           {
@@ -7289,35 +6081,22 @@
             "isPrimary": true,
             "tags": [
               {
-                "name": "tag1",
-                "category": "category1",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag1 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag2",
-                "category": "category2",
+                "name": "vt",
+                "category": "partOfSpeech",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag2 notes"
+                  "transitive verb"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
                 ],
-                "redundant": false
+                "redundant": true
               }
             ],
             "entries": [
-              "definition11",
-              "definition12"
+              "butsu definition 3",
+              "butsu definition 4"
             ]
           }
         ],
@@ -7386,38 +6165,12 @@
             ],
             "tags": [
               {
-                "name": "tag3",
-                "category": "category3",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag3 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag4",
-                "category": "category4",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag4 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag5",
-                "category": "category5",
+                "name": "E1",
+                "category": "default",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag5 notes"
+                  "example tag 1"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -7425,7 +6178,9 @@
                 "redundant": false
               }
             ],
-            "wordClasses": []
+            "wordClasses": [
+              "n"
+            ]
           }
         ],
         "definitions": [
@@ -7441,25 +6196,12 @@
             "isPrimary": true,
             "tags": [
               {
-                "name": "tag1",
-                "category": "category1",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag1 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag2",
-                "category": "category2",
+                "name": "n",
+                "category": "partOfSpeech",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag2 notes"
+                  "noun"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -7468,8 +6210,8 @@
               }
             ],
             "entries": [
-              "definition1",
-              "definition2"
+              "da definition 1",
+              "da definition 2"
             ]
           }
         ],
@@ -7520,38 +6262,12 @@
             ],
             "tags": [
               {
-                "name": "tag3",
-                "category": "category3",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag3 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag4",
-                "category": "category4",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag4 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag5",
-                "category": "category5",
+                "name": "E1",
+                "category": "default",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag5 notes"
+                  "example tag 1"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -7559,7 +6275,9 @@
                 "redundant": false
               }
             ],
-            "wordClasses": []
+            "wordClasses": [
+              "n"
+            ]
           }
         ],
         "definitions": [
@@ -7575,12 +6293,12 @@
             "isPrimary": true,
             "tags": [
               {
-                "name": "tag1",
-                "category": "category1",
+                "name": "abbr",
+                "category": "default",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag1 notes"
+                  "abbreviation"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -7588,12 +6306,12 @@
                 "redundant": false
               },
               {
-                "name": "tag2",
-                "category": "category2",
+                "name": "n",
+                "category": "partOfSpeech",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag2 notes"
+                  "noun"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -7602,8 +6320,8 @@
               }
             ],
             "entries": [
-              "definition3",
-              "definition4"
+              "daasu definition 1",
+              "daasu definition 2"
             ]
           }
         ],
@@ -7664,25 +6382,12 @@
             ],
             "tags": [
               {
-                "name": "tag3",
-                "category": "category3",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag3 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag4",
-                "category": "category4",
+                "name": "E1",
+                "category": "default",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag4 notes"
+                  "example tag 1"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -7690,12 +6395,12 @@
                 "redundant": false
               },
               {
-                "name": "tag5",
-                "category": "category5",
+                "name": "P",
+                "category": "popular",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag5 notes"
+                  "popular term"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -7721,25 +6426,12 @@
             "isPrimary": true,
             "tags": [
               {
-                "name": "tag1",
-                "category": "category1",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag1 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag2",
-                "category": "category2",
+                "name": "vt",
+                "category": "partOfSpeech",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag2 notes"
+                  "transitive verb"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -7748,8 +6440,8 @@
               }
             ],
             "entries": [
-              "definition13",
-              "definition14"
+              "uchikomu definition 1",
+              "uchikomu definition 2"
             ]
           }
         ],
@@ -7822,25 +6514,12 @@
             ],
             "tags": [
               {
-                "name": "tag3",
-                "category": "category3",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag3 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag4",
-                "category": "category4",
+                "name": "E1",
+                "category": "default",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag4 notes"
+                  "example tag 1"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -7848,12 +6527,12 @@
                 "redundant": false
               },
               {
-                "name": "tag5",
-                "category": "category5",
+                "name": "P",
+                "category": "popular",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag5 notes"
+                  "popular term"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -7879,25 +6558,12 @@
             "isPrimary": true,
             "tags": [
               {
-                "name": "tag1",
-                "category": "category1",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag1 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag2",
-                "category": "category2",
+                "name": "vt",
+                "category": "partOfSpeech",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag2 notes"
+                  "transitive verb"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -7906,8 +6572,8 @@
               }
             ],
             "entries": [
-              "definition17",
-              "definition18"
+              "buchikomu definition 1",
+              "buchikomu definition 2"
             ]
           }
         ],
@@ -7980,12 +6646,12 @@
             ],
             "tags": [
               {
-                "name": "tag5",
-                "category": "category5",
+                "name": "E2",
+                "category": "default",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag5 notes"
+                  "example tag 2"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -7993,22 +6659,13 @@
                 "redundant": false
               },
               {
-                "name": "tag6",
-                "category": "default",
+                "name": "P",
+                "category": "popular",
                 "order": 0,
                 "score": 0,
-                "content": [],
-                "dictionaries": [
-                  "Test Dictionary 2"
+                "content": [
+                  "popular term"
                 ],
-                "redundant": false
-              },
-              {
-                "name": "tag7",
-                "category": "default",
-                "order": 0,
-                "score": 0,
-                "content": [],
                 "dictionaries": [
                   "Test Dictionary 2"
                 ],
@@ -8033,25 +6690,12 @@
             "isPrimary": true,
             "tags": [
               {
-                "name": "tag1",
-                "category": "category1",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag1 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag2",
-                "category": "category2",
+                "name": "vt",
+                "category": "partOfSpeech",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag2 notes"
+                  "transitive verb"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -8060,8 +6704,8 @@
               }
             ],
             "entries": [
-              "definition15",
-              "definition16"
+              "uchikomu definition 3",
+              "uchikomu definition 4"
             ]
           }
         ],
@@ -8134,25 +6778,12 @@
             ],
             "tags": [
               {
-                "name": "tag3",
-                "category": "category3",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag3 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag4",
-                "category": "category4",
+                "name": "E2",
+                "category": "default",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag4 notes"
+                  "example tag 2"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -8160,12 +6791,12 @@
                 "redundant": false
               },
               {
-                "name": "tag5",
-                "category": "category5",
+                "name": "P",
+                "category": "popular",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag5 notes"
+                  "popular term"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -8191,25 +6822,12 @@
             "isPrimary": true,
             "tags": [
               {
-                "name": "tag1",
-                "category": "category1",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag1 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag2",
-                "category": "category2",
+                "name": "vt",
+                "category": "partOfSpeech",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag2 notes"
+                  "transitive verb"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -8218,8 +6836,8 @@
               }
             ],
             "entries": [
-              "definition19",
-              "definition20"
+              "buchikomu definition 3",
+              "buchikomu definition 4"
             ]
           }
         ],
@@ -8290,25 +6908,12 @@
             ],
             "tags": [
               {
-                "name": "tag3",
-                "category": "category3",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag3 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag4",
-                "category": "category4",
+                "name": "E1",
+                "category": "default",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag4 notes"
+                  "example tag 1"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -8316,12 +6921,12 @@
                 "redundant": false
               },
               {
-                "name": "tag5",
-                "category": "category5",
+                "name": "P",
+                "category": "popular",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag5 notes"
+                  "popular term"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -8347,25 +6952,12 @@
             "isPrimary": true,
             "tags": [
               {
-                "name": "tag1",
-                "category": "category1",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag1 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag2",
-                "category": "category2",
+                "name": "vt",
+                "category": "partOfSpeech",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag2 notes"
+                  "transitive verb"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -8374,8 +6966,8 @@
               }
             ],
             "entries": [
-              "definition5",
-              "definition6"
+              "utsu definition 1",
+              "utsu definition 2"
             ]
           }
         ],
@@ -8428,25 +7020,12 @@
             ],
             "tags": [
               {
-                "name": "tag3",
-                "category": "category3",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag3 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag4",
-                "category": "category4",
+                "name": "E1",
+                "category": "default",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag4 notes"
+                  "example tag 1"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -8454,12 +7033,12 @@
                 "redundant": false
               },
               {
-                "name": "tag5",
-                "category": "category5",
+                "name": "P",
+                "category": "popular",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag5 notes"
+                  "popular term"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -8485,25 +7064,12 @@
             "isPrimary": true,
             "tags": [
               {
-                "name": "tag1",
-                "category": "category1",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag1 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag2",
-                "category": "category2",
+                "name": "vt",
+                "category": "partOfSpeech",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag2 notes"
+                  "transitive verb"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -8512,8 +7078,8 @@
               }
             ],
             "entries": [
-              "definition9",
-              "definition10"
+              "butsu definition 1",
+              "butsu definition 2"
             ]
           }
         ],
@@ -8566,25 +7132,12 @@
             ],
             "tags": [
               {
-                "name": "tag3",
-                "category": "category3",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag3 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag4",
-                "category": "category4",
+                "name": "E2",
+                "category": "default",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag4 notes"
+                  "example tag 2"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -8592,12 +7145,12 @@
                 "redundant": false
               },
               {
-                "name": "tag5",
-                "category": "category5",
+                "name": "P",
+                "category": "popular",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag5 notes"
+                  "popular term"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -8623,25 +7176,12 @@
             "isPrimary": true,
             "tags": [
               {
-                "name": "tag1",
-                "category": "category1",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag1 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag2",
-                "category": "category2",
+                "name": "vt",
+                "category": "partOfSpeech",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag2 notes"
+                  "transitive verb"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -8650,8 +7190,8 @@
               }
             ],
             "entries": [
-              "definition7",
-              "definition8"
+              "utsu definition 3",
+              "utsu definition 4"
             ]
           }
         ],
@@ -8704,25 +7244,12 @@
             ],
             "tags": [
               {
-                "name": "tag3",
-                "category": "category3",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag3 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag4",
-                "category": "category4",
+                "name": "E2",
+                "category": "default",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag4 notes"
+                  "example tag 2"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -8730,12 +7257,12 @@
                 "redundant": false
               },
               {
-                "name": "tag5",
-                "category": "category5",
+                "name": "P",
+                "category": "popular",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag5 notes"
+                  "popular term"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -8761,25 +7288,12 @@
             "isPrimary": true,
             "tags": [
               {
-                "name": "tag1",
-                "category": "category1",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag1 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag2",
-                "category": "category2",
+                "name": "vt",
+                "category": "partOfSpeech",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag2 notes"
+                  "transitive verb"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -8788,8 +7302,8 @@
               }
             ],
             "entries": [
-              "definition11",
-              "definition12"
+              "butsu definition 3",
+              "butsu definition 4"
             ]
           }
         ],
@@ -8840,38 +7354,12 @@
             ],
             "tags": [
               {
-                "name": "tag3",
-                "category": "category3",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag3 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag4",
-                "category": "category4",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag4 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag5",
-                "category": "category5",
+                "name": "E1",
+                "category": "default",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag5 notes"
+                  "example tag 1"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -8879,7 +7367,9 @@
                 "redundant": false
               }
             ],
-            "wordClasses": []
+            "wordClasses": [
+              "n"
+            ]
           }
         ],
         "definitions": [
@@ -8895,25 +7385,12 @@
             "isPrimary": true,
             "tags": [
               {
-                "name": "tag1",
-                "category": "category1",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag1 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag2",
-                "category": "category2",
+                "name": "n",
+                "category": "partOfSpeech",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag2 notes"
+                  "noun"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -8922,8 +7399,8 @@
               }
             ],
             "entries": [
-              "definition1",
-              "definition2"
+              "da definition 1",
+              "da definition 2"
             ]
           }
         ],
@@ -8974,38 +7451,12 @@
             ],
             "tags": [
               {
-                "name": "tag3",
-                "category": "category3",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag3 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag4",
-                "category": "category4",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag4 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag5",
-                "category": "category5",
+                "name": "E1",
+                "category": "default",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag5 notes"
+                  "example tag 1"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -9013,7 +7464,9 @@
                 "redundant": false
               }
             ],
-            "wordClasses": []
+            "wordClasses": [
+              "n"
+            ]
           }
         ],
         "definitions": [
@@ -9029,12 +7482,12 @@
             "isPrimary": true,
             "tags": [
               {
-                "name": "tag1",
-                "category": "category1",
+                "name": "abbr",
+                "category": "default",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag1 notes"
+                  "abbreviation"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -9042,12 +7495,12 @@
                 "redundant": false
               },
               {
-                "name": "tag2",
-                "category": "category2",
+                "name": "n",
+                "category": "partOfSpeech",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag2 notes"
+                  "noun"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -9056,8 +7509,8 @@
               }
             ],
             "entries": [
-              "definition3",
-              "definition4"
+              "daasu definition 1",
+              "daasu definition 2"
             ]
           }
         ],
@@ -9114,25 +7567,12 @@
             ],
             "tags": [
               {
-                "name": "tag3",
-                "category": "category3",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag3 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag4",
-                "category": "category4",
+                "name": "E1",
+                "category": "default",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag4 notes"
+                  "example tag 1"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -9140,12 +7580,12 @@
                 "redundant": false
               },
               {
-                "name": "tag5",
-                "category": "category5",
+                "name": "P",
+                "category": "popular",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag5 notes"
+                  "popular term"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -9171,25 +7611,12 @@
             "isPrimary": true,
             "tags": [
               {
-                "name": "tag1",
-                "category": "category1",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag1 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag2",
-                "category": "category2",
+                "name": "vt",
+                "category": "partOfSpeech",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag2 notes"
+                  "transitive verb"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -9198,8 +7625,8 @@
               }
             ],
             "entries": [
-              "definition13",
-              "definition14"
+              "uchikomu definition 1",
+              "uchikomu definition 2"
             ]
           }
         ],
@@ -9268,25 +7695,12 @@
             ],
             "tags": [
               {
-                "name": "tag3",
-                "category": "category3",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag3 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag4",
-                "category": "category4",
+                "name": "E1",
+                "category": "default",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag4 notes"
+                  "example tag 1"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -9294,12 +7708,12 @@
                 "redundant": false
               },
               {
-                "name": "tag5",
-                "category": "category5",
+                "name": "P",
+                "category": "popular",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag5 notes"
+                  "popular term"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -9325,25 +7739,12 @@
             "isPrimary": true,
             "tags": [
               {
-                "name": "tag1",
-                "category": "category1",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag1 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag2",
-                "category": "category2",
+                "name": "vt",
+                "category": "partOfSpeech",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag2 notes"
+                  "transitive verb"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -9352,8 +7753,8 @@
               }
             ],
             "entries": [
-              "definition17",
-              "definition18"
+              "buchikomu definition 1",
+              "buchikomu definition 2"
             ]
           }
         ],
@@ -9422,12 +7823,12 @@
             ],
             "tags": [
               {
-                "name": "tag5",
-                "category": "category5",
+                "name": "E2",
+                "category": "default",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag5 notes"
+                  "example tag 2"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -9435,22 +7836,13 @@
                 "redundant": false
               },
               {
-                "name": "tag6",
-                "category": "default",
+                "name": "P",
+                "category": "popular",
                 "order": 0,
                 "score": 0,
-                "content": [],
-                "dictionaries": [
-                  "Test Dictionary 2"
+                "content": [
+                  "popular term"
                 ],
-                "redundant": false
-              },
-              {
-                "name": "tag7",
-                "category": "default",
-                "order": 0,
-                "score": 0,
-                "content": [],
                 "dictionaries": [
                   "Test Dictionary 2"
                 ],
@@ -9475,25 +7867,12 @@
             "isPrimary": true,
             "tags": [
               {
-                "name": "tag1",
-                "category": "category1",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag1 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag2",
-                "category": "category2",
+                "name": "vt",
+                "category": "partOfSpeech",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag2 notes"
+                  "transitive verb"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -9502,8 +7881,8 @@
               }
             ],
             "entries": [
-              "definition15",
-              "definition16"
+              "uchikomu definition 3",
+              "uchikomu definition 4"
             ]
           }
         ],
@@ -9572,25 +7951,12 @@
             ],
             "tags": [
               {
-                "name": "tag3",
-                "category": "category3",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag3 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag4",
-                "category": "category4",
+                "name": "E2",
+                "category": "default",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag4 notes"
+                  "example tag 2"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -9598,12 +7964,12 @@
                 "redundant": false
               },
               {
-                "name": "tag5",
-                "category": "category5",
+                "name": "P",
+                "category": "popular",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag5 notes"
+                  "popular term"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -9629,25 +7995,12 @@
             "isPrimary": true,
             "tags": [
               {
-                "name": "tag1",
-                "category": "category1",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag1 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag2",
-                "category": "category2",
+                "name": "vt",
+                "category": "partOfSpeech",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag2 notes"
+                  "transitive verb"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -9656,8 +8009,8 @@
               }
             ],
             "entries": [
-              "definition19",
-              "definition20"
+              "buchikomu definition 3",
+              "buchikomu definition 4"
             ]
           }
         ],
@@ -9728,25 +8081,12 @@
             ],
             "tags": [
               {
-                "name": "tag3",
-                "category": "category3",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag3 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag4",
-                "category": "category4",
+                "name": "E1",
+                "category": "default",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag4 notes"
+                  "example tag 1"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -9754,12 +8094,12 @@
                 "redundant": false
               },
               {
-                "name": "tag5",
-                "category": "category5",
+                "name": "P",
+                "category": "popular",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag5 notes"
+                  "popular term"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -9785,25 +8125,12 @@
             "isPrimary": true,
             "tags": [
               {
-                "name": "tag1",
-                "category": "category1",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag1 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag2",
-                "category": "category2",
+                "name": "vt",
+                "category": "partOfSpeech",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag2 notes"
+                  "transitive verb"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -9812,8 +8139,8 @@
               }
             ],
             "entries": [
-              "definition5",
-              "definition6"
+              "utsu definition 1",
+              "utsu definition 2"
             ]
           }
         ],
@@ -9866,25 +8193,12 @@
             ],
             "tags": [
               {
-                "name": "tag3",
-                "category": "category3",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag3 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag4",
-                "category": "category4",
+                "name": "E1",
+                "category": "default",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag4 notes"
+                  "example tag 1"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -9892,12 +8206,12 @@
                 "redundant": false
               },
               {
-                "name": "tag5",
-                "category": "category5",
+                "name": "P",
+                "category": "popular",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag5 notes"
+                  "popular term"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -9923,25 +8237,12 @@
             "isPrimary": true,
             "tags": [
               {
-                "name": "tag1",
-                "category": "category1",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag1 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag2",
-                "category": "category2",
+                "name": "vt",
+                "category": "partOfSpeech",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag2 notes"
+                  "transitive verb"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -9950,8 +8251,8 @@
               }
             ],
             "entries": [
-              "definition9",
-              "definition10"
+              "butsu definition 1",
+              "butsu definition 2"
             ]
           }
         ],
@@ -10004,25 +8305,12 @@
             ],
             "tags": [
               {
-                "name": "tag3",
-                "category": "category3",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag3 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag4",
-                "category": "category4",
+                "name": "E2",
+                "category": "default",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag4 notes"
+                  "example tag 2"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -10030,12 +8318,12 @@
                 "redundant": false
               },
               {
-                "name": "tag5",
-                "category": "category5",
+                "name": "P",
+                "category": "popular",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag5 notes"
+                  "popular term"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -10061,25 +8349,12 @@
             "isPrimary": true,
             "tags": [
               {
-                "name": "tag1",
-                "category": "category1",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag1 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag2",
-                "category": "category2",
+                "name": "vt",
+                "category": "partOfSpeech",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag2 notes"
+                  "transitive verb"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -10088,8 +8363,8 @@
               }
             ],
             "entries": [
-              "definition7",
-              "definition8"
+              "utsu definition 3",
+              "utsu definition 4"
             ]
           }
         ],
@@ -10142,25 +8417,12 @@
             ],
             "tags": [
               {
-                "name": "tag3",
-                "category": "category3",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag3 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag4",
-                "category": "category4",
+                "name": "E2",
+                "category": "default",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag4 notes"
+                  "example tag 2"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -10168,12 +8430,12 @@
                 "redundant": false
               },
               {
-                "name": "tag5",
-                "category": "category5",
+                "name": "P",
+                "category": "popular",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag5 notes"
+                  "popular term"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -10199,25 +8461,12 @@
             "isPrimary": true,
             "tags": [
               {
-                "name": "tag1",
-                "category": "category1",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag1 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag2",
-                "category": "category2",
+                "name": "vt",
+                "category": "partOfSpeech",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag2 notes"
+                  "transitive verb"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -10226,8 +8475,8 @@
               }
             ],
             "entries": [
-              "definition11",
-              "definition12"
+              "butsu definition 3",
+              "butsu definition 4"
             ]
           }
         ],
@@ -10278,38 +8527,12 @@
             ],
             "tags": [
               {
-                "name": "tag3",
-                "category": "category3",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag3 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag4",
-                "category": "category4",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag4 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag5",
-                "category": "category5",
+                "name": "E1",
+                "category": "default",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag5 notes"
+                  "example tag 1"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -10317,7 +8540,9 @@
                 "redundant": false
               }
             ],
-            "wordClasses": []
+            "wordClasses": [
+              "n"
+            ]
           }
         ],
         "definitions": [
@@ -10333,25 +8558,12 @@
             "isPrimary": true,
             "tags": [
               {
-                "name": "tag1",
-                "category": "category1",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag1 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag2",
-                "category": "category2",
+                "name": "n",
+                "category": "partOfSpeech",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag2 notes"
+                  "noun"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -10360,8 +8572,8 @@
               }
             ],
             "entries": [
-              "definition1",
-              "definition2"
+              "da definition 1",
+              "da definition 2"
             ]
           }
         ],
@@ -10412,38 +8624,12 @@
             ],
             "tags": [
               {
-                "name": "tag3",
-                "category": "category3",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag3 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag4",
-                "category": "category4",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag4 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag5",
-                "category": "category5",
+                "name": "E1",
+                "category": "default",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag5 notes"
+                  "example tag 1"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -10451,7 +8637,9 @@
                 "redundant": false
               }
             ],
-            "wordClasses": []
+            "wordClasses": [
+              "n"
+            ]
           }
         ],
         "definitions": [
@@ -10467,12 +8655,12 @@
             "isPrimary": true,
             "tags": [
               {
-                "name": "tag1",
-                "category": "category1",
+                "name": "abbr",
+                "category": "default",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag1 notes"
+                  "abbreviation"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -10480,12 +8668,12 @@
                 "redundant": false
               },
               {
-                "name": "tag2",
-                "category": "category2",
+                "name": "n",
+                "category": "partOfSpeech",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag2 notes"
+                  "noun"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -10494,8 +8682,8 @@
               }
             ],
             "entries": [
-              "definition3",
-              "definition4"
+              "daasu definition 1",
+              "daasu definition 2"
             ]
           }
         ],
@@ -10552,25 +8740,12 @@
             ],
             "tags": [
               {
-                "name": "tag3",
-                "category": "category3",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag3 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag4",
-                "category": "category4",
+                "name": "E1",
+                "category": "default",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag4 notes"
+                  "example tag 1"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -10578,12 +8753,12 @@
                 "redundant": false
               },
               {
-                "name": "tag5",
-                "category": "category5",
+                "name": "P",
+                "category": "popular",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag5 notes"
+                  "popular term"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -10609,25 +8784,12 @@
             "isPrimary": true,
             "tags": [
               {
-                "name": "tag1",
-                "category": "category1",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag1 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag2",
-                "category": "category2",
+                "name": "vt",
+                "category": "partOfSpeech",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag2 notes"
+                  "transitive verb"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -10636,8 +8798,8 @@
               }
             ],
             "entries": [
-              "definition13",
-              "definition14"
+              "uchikomu definition 1",
+              "uchikomu definition 2"
             ]
           }
         ],
@@ -10706,25 +8868,12 @@
             ],
             "tags": [
               {
-                "name": "tag3",
-                "category": "category3",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag3 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag4",
-                "category": "category4",
+                "name": "E1",
+                "category": "default",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag4 notes"
+                  "example tag 1"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -10732,12 +8881,12 @@
                 "redundant": false
               },
               {
-                "name": "tag5",
-                "category": "category5",
+                "name": "P",
+                "category": "popular",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag5 notes"
+                  "popular term"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -10763,25 +8912,12 @@
             "isPrimary": true,
             "tags": [
               {
-                "name": "tag1",
-                "category": "category1",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag1 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag2",
-                "category": "category2",
+                "name": "vt",
+                "category": "partOfSpeech",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag2 notes"
+                  "transitive verb"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -10790,8 +8926,8 @@
               }
             ],
             "entries": [
-              "definition17",
-              "definition18"
+              "buchikomu definition 1",
+              "buchikomu definition 2"
             ]
           }
         ],
@@ -10860,12 +8996,12 @@
             ],
             "tags": [
               {
-                "name": "tag5",
-                "category": "category5",
+                "name": "E2",
+                "category": "default",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag5 notes"
+                  "example tag 2"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -10873,22 +9009,13 @@
                 "redundant": false
               },
               {
-                "name": "tag6",
-                "category": "default",
+                "name": "P",
+                "category": "popular",
                 "order": 0,
                 "score": 0,
-                "content": [],
-                "dictionaries": [
-                  "Test Dictionary 2"
+                "content": [
+                  "popular term"
                 ],
-                "redundant": false
-              },
-              {
-                "name": "tag7",
-                "category": "default",
-                "order": 0,
-                "score": 0,
-                "content": [],
                 "dictionaries": [
                   "Test Dictionary 2"
                 ],
@@ -10913,25 +9040,12 @@
             "isPrimary": true,
             "tags": [
               {
-                "name": "tag1",
-                "category": "category1",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag1 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag2",
-                "category": "category2",
+                "name": "vt",
+                "category": "partOfSpeech",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag2 notes"
+                  "transitive verb"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -10940,8 +9054,8 @@
               }
             ],
             "entries": [
-              "definition15",
-              "definition16"
+              "uchikomu definition 3",
+              "uchikomu definition 4"
             ]
           }
         ],
@@ -11010,25 +9124,12 @@
             ],
             "tags": [
               {
-                "name": "tag3",
-                "category": "category3",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag3 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag4",
-                "category": "category4",
+                "name": "E2",
+                "category": "default",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag4 notes"
+                  "example tag 2"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -11036,12 +9137,12 @@
                 "redundant": false
               },
               {
-                "name": "tag5",
-                "category": "category5",
+                "name": "P",
+                "category": "popular",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag5 notes"
+                  "popular term"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -11067,25 +9168,12 @@
             "isPrimary": true,
             "tags": [
               {
-                "name": "tag1",
-                "category": "category1",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag1 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag2",
-                "category": "category2",
+                "name": "vt",
+                "category": "partOfSpeech",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag2 notes"
+                  "transitive verb"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -11094,8 +9182,8 @@
               }
             ],
             "entries": [
-              "definition19",
-              "definition20"
+              "buchikomu definition 3",
+              "buchikomu definition 4"
             ]
           }
         ],
@@ -11166,25 +9254,12 @@
             ],
             "tags": [
               {
-                "name": "tag3",
-                "category": "category3",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag3 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag4",
-                "category": "category4",
+                "name": "E1",
+                "category": "default",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag4 notes"
+                  "example tag 1"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -11192,12 +9267,12 @@
                 "redundant": false
               },
               {
-                "name": "tag5",
-                "category": "category5",
+                "name": "P",
+                "category": "popular",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag5 notes"
+                  "popular term"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -11223,25 +9298,12 @@
             "isPrimary": true,
             "tags": [
               {
-                "name": "tag1",
-                "category": "category1",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag1 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag2",
-                "category": "category2",
+                "name": "vt",
+                "category": "partOfSpeech",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag2 notes"
+                  "transitive verb"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -11250,8 +9312,8 @@
               }
             ],
             "entries": [
-              "definition5",
-              "definition6"
+              "utsu definition 1",
+              "utsu definition 2"
             ]
           }
         ],
@@ -11304,25 +9366,12 @@
             ],
             "tags": [
               {
-                "name": "tag3",
-                "category": "category3",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag3 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag4",
-                "category": "category4",
+                "name": "E1",
+                "category": "default",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag4 notes"
+                  "example tag 1"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -11330,12 +9379,12 @@
                 "redundant": false
               },
               {
-                "name": "tag5",
-                "category": "category5",
+                "name": "P",
+                "category": "popular",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag5 notes"
+                  "popular term"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -11361,25 +9410,12 @@
             "isPrimary": true,
             "tags": [
               {
-                "name": "tag1",
-                "category": "category1",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag1 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag2",
-                "category": "category2",
+                "name": "vt",
+                "category": "partOfSpeech",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag2 notes"
+                  "transitive verb"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -11388,8 +9424,8 @@
               }
             ],
             "entries": [
-              "definition9",
-              "definition10"
+              "butsu definition 1",
+              "butsu definition 2"
             ]
           }
         ],
@@ -11442,25 +9478,12 @@
             ],
             "tags": [
               {
-                "name": "tag3",
-                "category": "category3",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag3 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag4",
-                "category": "category4",
+                "name": "E2",
+                "category": "default",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag4 notes"
+                  "example tag 2"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -11468,12 +9491,12 @@
                 "redundant": false
               },
               {
-                "name": "tag5",
-                "category": "category5",
+                "name": "P",
+                "category": "popular",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag5 notes"
+                  "popular term"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -11499,25 +9522,12 @@
             "isPrimary": true,
             "tags": [
               {
-                "name": "tag1",
-                "category": "category1",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag1 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag2",
-                "category": "category2",
+                "name": "vt",
+                "category": "partOfSpeech",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag2 notes"
+                  "transitive verb"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -11526,8 +9536,8 @@
               }
             ],
             "entries": [
-              "definition7",
-              "definition8"
+              "utsu definition 3",
+              "utsu definition 4"
             ]
           }
         ],
@@ -11580,25 +9590,12 @@
             ],
             "tags": [
               {
-                "name": "tag3",
-                "category": "category3",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag3 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag4",
-                "category": "category4",
+                "name": "E2",
+                "category": "default",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag4 notes"
+                  "example tag 2"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -11606,12 +9603,12 @@
                 "redundant": false
               },
               {
-                "name": "tag5",
-                "category": "category5",
+                "name": "P",
+                "category": "popular",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag5 notes"
+                  "popular term"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -11637,25 +9634,12 @@
             "isPrimary": true,
             "tags": [
               {
-                "name": "tag1",
-                "category": "category1",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag1 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag2",
-                "category": "category2",
+                "name": "vt",
+                "category": "partOfSpeech",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag2 notes"
+                  "transitive verb"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -11664,8 +9648,8 @@
               }
             ],
             "entries": [
-              "definition11",
-              "definition12"
+              "butsu definition 3",
+              "butsu definition 4"
             ]
           }
         ],
@@ -11716,38 +9700,12 @@
             ],
             "tags": [
               {
-                "name": "tag3",
-                "category": "category3",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag3 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag4",
-                "category": "category4",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag4 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag5",
-                "category": "category5",
+                "name": "E1",
+                "category": "default",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag5 notes"
+                  "example tag 1"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -11755,7 +9713,9 @@
                 "redundant": false
               }
             ],
-            "wordClasses": []
+            "wordClasses": [
+              "n"
+            ]
           }
         ],
         "definitions": [
@@ -11771,25 +9731,12 @@
             "isPrimary": true,
             "tags": [
               {
-                "name": "tag1",
-                "category": "category1",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag1 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag2",
-                "category": "category2",
+                "name": "n",
+                "category": "partOfSpeech",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag2 notes"
+                  "noun"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -11798,8 +9745,8 @@
               }
             ],
             "entries": [
-              "definition1",
-              "definition2"
+              "da definition 1",
+              "da definition 2"
             ]
           }
         ],
@@ -11850,38 +9797,12 @@
             ],
             "tags": [
               {
-                "name": "tag3",
-                "category": "category3",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag3 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag4",
-                "category": "category4",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag4 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag5",
-                "category": "category5",
+                "name": "E1",
+                "category": "default",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag5 notes"
+                  "example tag 1"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -11889,7 +9810,9 @@
                 "redundant": false
               }
             ],
-            "wordClasses": []
+            "wordClasses": [
+              "n"
+            ]
           }
         ],
         "definitions": [
@@ -11905,12 +9828,12 @@
             "isPrimary": true,
             "tags": [
               {
-                "name": "tag1",
-                "category": "category1",
+                "name": "abbr",
+                "category": "default",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag1 notes"
+                  "abbreviation"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -11918,12 +9841,12 @@
                 "redundant": false
               },
               {
-                "name": "tag2",
-                "category": "category2",
+                "name": "n",
+                "category": "partOfSpeech",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag2 notes"
+                  "noun"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -11932,8 +9855,8 @@
               }
             ],
             "entries": [
-              "definition3",
-              "definition4"
+              "daasu definition 1",
+              "daasu definition 2"
             ]
           }
         ],
@@ -11992,12 +9915,25 @@
             ],
             "tags": [
               {
-                "name": "vt",
-                "category": "partOfSpeech",
+                "name": "E1",
+                "category": "default",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "transitive verb"
+                  "example tag 1"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
+              },
+              {
+                "name": "P",
+                "category": "popular",
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "popular term"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -12023,12 +9959,12 @@
             "isPrimary": true,
             "tags": [
               {
-                "name": "popular",
-                "category": "popular",
+                "name": "vt",
+                "category": "partOfSpeech",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "popular term"
+                  "transitive verb"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -12073,7 +10009,34 @@
                 "isPrimary": true
               }
             ],
-            "tags": [],
+            "tags": [
+              {
+                "name": "E1",
+                "category": "default",
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "example tag 1"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
+              },
+              {
+                "name": "P",
+                "category": "popular",
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "popular term"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
+              }
+            ],
             "wordClasses": [
               "n"
             ]
@@ -12092,12 +10055,12 @@
             "isPrimary": true,
             "tags": [
               {
-                "name": "popular",
-                "category": "popular",
+                "name": "n",
+                "category": "partOfSpeech",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "popular term"
+                  "noun"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -12146,12 +10109,25 @@
             ],
             "tags": [
               {
-                "name": "vt",
-                "category": "partOfSpeech",
+                "name": "E1",
+                "category": "default",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "transitive verb"
+                  "example tag 1"
+                ],
+                "dictionaries": [
+                  "Test Dictionary 2"
+                ],
+                "redundant": false
+              },
+              {
+                "name": "P",
+                "category": "popular",
+                "order": 0,
+                "score": 0,
+                "content": [
+                  "popular term"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -12177,12 +10153,12 @@
             "isPrimary": true,
             "tags": [
               {
-                "name": "popular",
-                "category": "popular",
+                "name": "vt",
+                "category": "partOfSpeech",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "popular term"
+                  "transitive verb"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -12229,12 +10205,12 @@
             ],
             "tags": [
               {
-                "name": "tag3",
-                "category": "category3",
+                "name": "E1",
+                "category": "default",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag3 notes"
+                  "example tag 1"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -12242,12 +10218,12 @@
                 "redundant": false
               },
               {
-                "name": "tag4",
-                "category": "category4",
+                "name": "E2",
+                "category": "default",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag4 notes"
+                  "example tag 2"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -12255,39 +10231,17 @@
                 "redundant": false
               },
               {
-                "name": "tag5",
-                "category": "category5",
+                "name": "P",
+                "category": "popular",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag5 notes"
+                  "popular term"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
                 ],
                 "redundant": false
-              },
-              {
-                "name": "tag6",
-                "category": "default",
-                "order": 0,
-                "score": 0,
-                "content": [],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag7",
-                "category": "default",
-                "order": 0,
-                "score": 0,
-                "content": [],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
               }
             ],
             "wordClasses": [
@@ -12308,12 +10262,12 @@
             ],
             "tags": [
               {
-                "name": "tag3",
-                "category": "category3",
+                "name": "E1",
+                "category": "default",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag3 notes"
+                  "example tag 1"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -12321,12 +10275,12 @@
                 "redundant": false
               },
               {
-                "name": "tag4",
-                "category": "category4",
+                "name": "E2",
+                "category": "default",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag4 notes"
+                  "example tag 2"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -12334,12 +10288,12 @@
                 "redundant": false
               },
               {
-                "name": "tag5",
-                "category": "category5",
+                "name": "P",
+                "category": "popular",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag5 notes"
+                  "popular term"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -12365,25 +10319,12 @@
             "isPrimary": true,
             "tags": [
               {
-                "name": "tag1",
-                "category": "category1",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag1 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag2",
-                "category": "category2",
+                "name": "vt",
+                "category": "partOfSpeech",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag2 notes"
+                  "transitive verb"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -12392,8 +10333,8 @@
               }
             ],
             "entries": [
-              "definition13",
-              "definition14"
+              "uchikomu definition 1",
+              "uchikomu definition 2"
             ]
           },
           {
@@ -12408,35 +10349,22 @@
             "isPrimary": false,
             "tags": [
               {
-                "name": "tag1",
-                "category": "category1",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag1 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag2",
-                "category": "category2",
+                "name": "vt",
+                "category": "partOfSpeech",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag2 notes"
+                  "transitive verb"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
                 ],
-                "redundant": false
+                "redundant": true
               }
             ],
             "entries": [
-              "definition17",
-              "definition18"
+              "buchikomu definition 1",
+              "buchikomu definition 2"
             ]
           },
           {
@@ -12451,35 +10379,22 @@
             "isPrimary": true,
             "tags": [
               {
-                "name": "tag1",
-                "category": "category1",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag1 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag2",
-                "category": "category2",
+                "name": "vt",
+                "category": "partOfSpeech",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag2 notes"
+                  "transitive verb"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
                 ],
-                "redundant": false
+                "redundant": true
               }
             ],
             "entries": [
-              "definition15",
-              "definition16"
+              "uchikomu definition 3",
+              "uchikomu definition 4"
             ]
           },
           {
@@ -12494,35 +10409,22 @@
             "isPrimary": false,
             "tags": [
               {
-                "name": "tag1",
-                "category": "category1",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag1 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag2",
-                "category": "category2",
+                "name": "vt",
+                "category": "partOfSpeech",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag2 notes"
+                  "transitive verb"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
                 ],
-                "redundant": false
+                "redundant": true
               }
             ],
             "entries": [
-              "definition19",
-              "definition20"
+              "buchikomu definition 3",
+              "buchikomu definition 4"
             ]
           }
         ],
@@ -12628,12 +10530,12 @@
             ],
             "tags": [
               {
-                "name": "tag3",
-                "category": "category3",
+                "name": "E1",
+                "category": "default",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag3 notes"
+                  "example tag 1"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -12641,12 +10543,12 @@
                 "redundant": false
               },
               {
-                "name": "tag4",
-                "category": "category4",
+                "name": "E2",
+                "category": "default",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag4 notes"
+                  "example tag 2"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -12654,12 +10556,12 @@
                 "redundant": false
               },
               {
-                "name": "tag5",
-                "category": "category5",
+                "name": "P",
+                "category": "popular",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag5 notes"
+                  "popular term"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -12685,12 +10587,12 @@
             ],
             "tags": [
               {
-                "name": "tag3",
-                "category": "category3",
+                "name": "E1",
+                "category": "default",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag3 notes"
+                  "example tag 1"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -12698,12 +10600,12 @@
                 "redundant": false
               },
               {
-                "name": "tag4",
-                "category": "category4",
+                "name": "E2",
+                "category": "default",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag4 notes"
+                  "example tag 2"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -12711,12 +10613,12 @@
                 "redundant": false
               },
               {
-                "name": "tag5",
-                "category": "category5",
+                "name": "P",
+                "category": "popular",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag5 notes"
+                  "popular term"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -12742,25 +10644,12 @@
             "isPrimary": true,
             "tags": [
               {
-                "name": "tag1",
-                "category": "category1",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag1 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag2",
-                "category": "category2",
+                "name": "vt",
+                "category": "partOfSpeech",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag2 notes"
+                  "transitive verb"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
@@ -12769,8 +10658,8 @@
               }
             ],
             "entries": [
-              "definition5",
-              "definition6"
+              "utsu definition 1",
+              "utsu definition 2"
             ]
           },
           {
@@ -12785,35 +10674,22 @@
             "isPrimary": false,
             "tags": [
               {
-                "name": "tag1",
-                "category": "category1",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag1 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag2",
-                "category": "category2",
+                "name": "vt",
+                "category": "partOfSpeech",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag2 notes"
+                  "transitive verb"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
                 ],
-                "redundant": false
+                "redundant": true
               }
             ],
             "entries": [
-              "definition9",
-              "definition10"
+              "butsu definition 1",
+              "butsu definition 2"
             ]
           },
           {
@@ -12828,35 +10704,22 @@
             "isPrimary": true,
             "tags": [
               {
-                "name": "tag1",
-                "category": "category1",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag1 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag2",
-                "category": "category2",
+                "name": "vt",
+                "category": "partOfSpeech",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag2 notes"
+                  "transitive verb"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
                 ],
-                "redundant": false
+                "redundant": true
               }
             ],
             "entries": [
-              "definition7",
-              "definition8"
+              "utsu definition 3",
+              "utsu definition 4"
             ]
           },
           {
@@ -12871,35 +10734,22 @@
             "isPrimary": false,
             "tags": [
               {
-                "name": "tag1",
-                "category": "category1",
-                "order": 0,
-                "score": 0,
-                "content": [
-                  "tag1 notes"
-                ],
-                "dictionaries": [
-                  "Test Dictionary 2"
-                ],
-                "redundant": false
-              },
-              {
-                "name": "tag2",
-                "category": "category2",
+                "name": "vt",
+                "category": "partOfSpeech",
                 "order": 0,
                 "score": 0,
                 "content": [
-                  "tag2 notes"
+                  "transitive verb"
                 ],
                 "dictionaries": [
                   "Test Dictionary 2"
                 ],
-                "redundant": false
+                "redundant": true
               }
             ],
             "entries": [
-              "definition11",
-              "definition12"
+              "butsu definition 3",
+              "butsu definition 4"
             ]
           }
         ],
diff --git a/test/test-anki-note-builder.js b/test/test-anki-note-builder.js
index 2ab79551..aad12aba 100644
--- a/test/test-anki-note-builder.js
+++ b/test/test-anki-note-builder.js
@@ -29,7 +29,7 @@ function clone(value) {
 async function createVM() {
     const vm = new TranslatorVM();
 
-    const dictionaryDirectory = path.join(__dirname, 'data', 'dictionaries', 'valid-dictionary2');
+    const dictionaryDirectory = path.join(__dirname, 'data', 'dictionaries', 'valid-dictionary1');
     await vm.prepare(dictionaryDirectory, 'Test Dictionary 2');
 
     vm.execute([
diff --git a/test/test-database.js b/test/test-database.js
index 3051925d..da4cc6d3 100644
--- a/test/test-database.js
+++ b/test/test-database.js
@@ -162,8 +162,8 @@ async function testDatabase1() {
             true
         );
         vm.assert.deepStrictEqual(counts, {
-            counts: [{kanji: 2, kanjiMeta: 2, terms: 33, termMeta: 12, tagMeta: 14, media: 1}],
-            total: {kanji: 2, kanjiMeta: 2, terms: 33, termMeta: 12, tagMeta: 14, media: 1}
+            counts: [{kanji: 2, kanjiMeta: 2, terms: 14, termMeta: 12, tagMeta: 15, media: 1}],
+            total: {kanji: 2, kanjiMeta: 2, terms: 14, termMeta: 12, tagMeta: 15, media: 1}
         });
 
         // Test find* functions
@@ -211,19 +211,19 @@ async function testFindTermsBulkTest1(database, titles) {
                 }
             ],
             expectedResults: {
-                total: 32,
+                total: 10,
                 terms: [
                     ['打', 2],
-                    ['打つ', 17],
-                    ['打ち込む', 13]
+                    ['打つ', 4],
+                    ['打ち込む', 4]
                 ],
                 readings: [
                     ['だ', 1],
                     ['ダース', 1],
-                    ['うつ', 15],
+                    ['うつ', 2],
                     ['ぶつ', 2],
-                    ['うちこむ', 9],
-                    ['ぶちこむ', 4]
+                    ['うちこむ', 2],
+                    ['ぶちこむ', 2]
                 ]
             }
         },
@@ -248,13 +248,13 @@ async function testFindTermsBulkTest1(database, titles) {
                 }
             ],
             expectedResults: {
-                total: 13,
+                total: 4,
                 terms: [
-                    ['打ち込む', 13]
+                    ['打ち込む', 4]
                 ],
                 readings: [
-                    ['うちこむ', 9],
-                    ['ぶちこむ', 4]
+                    ['うちこむ', 2],
+                    ['ぶちこむ', 2]
                 ]
             }
         },
@@ -300,16 +300,16 @@ async function testTindTermsExactBulk1(database, titles) {
                 }
             ],
             expectedResults: {
-                total: 25,
+                total: 5,
                 terms: [
                     ['打', 1],
-                    ['打つ', 15],
-                    ['打ち込む', 9]
+                    ['打つ', 2],
+                    ['打ち込む', 2]
                 ],
                 readings: [
                     ['だ', 1],
-                    ['うつ', 15],
-                    ['うちこむ', 9]
+                    ['うつ', 2],
+                    ['うちこむ', 2]
                 ]
             }
         },
@@ -339,12 +339,12 @@ async function testTindTermsExactBulk1(database, titles) {
                 }
             ],
             expectedResults: {
-                total: 17,
+                total: 4,
                 terms: [
-                    ['打つ', 17]
+                    ['打つ', 4]
                 ],
                 readings: [
-                    ['うつ', 15],
+                    ['うつ', 2],
                     ['ぶつ', 2]
                 ]
             }
@@ -400,20 +400,20 @@ async function testFindTermsBySequenceBulk1(database, mainDictionary) {
                 }
             ],
             expectedResults: {
-                total: 33,
+                total: 11,
                 terms: [
                     ['打', 2],
-                    ['打つ', 17],
-                    ['打ち込む', 13],
+                    ['打つ', 4],
+                    ['打ち込む', 4],
                     ['画像', 1]
                 ],
                 readings: [
                     ['だ', 1],
                     ['ダース', 1],
-                    ['うつ', 15],
+                    ['うつ', 2],
                     ['ぶつ', 2],
-                    ['うちこむ', 9],
-                    ['ぶちこむ', 4],
+                    ['うちこむ', 2],
+                    ['ぶちこむ', 2],
                     ['がぞう', 1]
                 ]
             }
@@ -457,12 +457,12 @@ async function testFindTermsBySequenceBulk1(database, mainDictionary) {
                 }
             ],
             expectedResults: {
-                total: 17,
+                total: 4,
                 terms: [
-                    ['打つ', 17]
+                    ['打つ', 4]
                 ],
                 readings: [
-                    ['うつ', 15],
+                    ['うつ', 2],
                     ['ぶつ', 2]
                 ]
             }
@@ -474,13 +474,13 @@ async function testFindTermsBySequenceBulk1(database, mainDictionary) {
                 }
             ],
             expectedResults: {
-                total: 13,
+                total: 4,
                 terms: [
-                    ['打ち込む', 13]
+                    ['打ち込む', 4]
                 ],
                 readings: [
-                    ['うちこむ', 9],
-                    ['ぶちこむ', 4]
+                    ['うちこむ', 2],
+                    ['ぶちこむ', 2]
                 ]
             }
         },
@@ -715,21 +715,21 @@ async function testFindTagForTitle1(database, title) {
         {
             inputs: [
                 {
-                    name: 'tag1'
+                    name: 'E1'
                 }
             ],
             expectedResults: {
-                value: {category: 'category1', dictionary: title, name: 'tag1', notes: 'tag1 notes', order: 0, score: 0}
+                value: {category: 'default', dictionary: title, name: 'E1', notes: 'example tag 1', order: 0, score: 0}
             }
         },
         {
             inputs: [
                 {
-                    name: 'ktag1'
+                    name: 'K1'
                 }
             ],
             expectedResults: {
-                value: {category: 'kcategory1', dictionary: title, name: 'ktag1', notes: 'ktag1 notes', order: 0, score: 0}
+                value: {category: 'default', dictionary: title, name: 'K1', notes: 'example kanji tag 1', order: 0, score: 0}
             }
         },
         {
@@ -739,7 +739,7 @@ async function testFindTagForTitle1(database, title) {
                 }
             ],
             expectedResults: {
-                value: {category: 'kcategory3', dictionary: title, name: 'kstat1', notes: 'kstat1 notes', order: 0, score: 0}
+                value: {category: 'class', dictionary: title, name: 'kstat1', notes: 'kanji stat 1', order: 0, score: 0}
             }
         },
         {
diff --git a/test/test-dictionary.js b/test/test-dictionary.js
index aebe1a7f..aca9b072 100644
--- a/test/test-dictionary.js
+++ b/test/test-dictionary.js
@@ -29,7 +29,6 @@ function createTestDictionaryArchive(dictionary, dictionaryName) {
 async function main() {
     const dictionaries = [
         {name: 'valid-dictionary1', valid: true},
-        {name: 'valid-dictionary2', valid: true},
         {name: 'invalid-dictionary1', valid: false},
         {name: 'invalid-dictionary2', valid: false},
         {name: 'invalid-dictionary3', valid: false},
diff --git a/test/test-translator.js b/test/test-translator.js
index 49dc7c06..0ae8137a 100644
--- a/test/test-translator.js
+++ b/test/test-translator.js
@@ -31,7 +31,7 @@ async function main() {
     const write = (process.argv[2] === '--write');
 
     const translatorVM = new TranslatorVM();
-    const dictionaryDirectory = path.join(__dirname, 'data', 'dictionaries', 'valid-dictionary2');
+    const dictionaryDirectory = path.join(__dirname, 'data', 'dictionaries', 'valid-dictionary1');
     await translatorVM.prepare(dictionaryDirectory, 'Test Dictionary 2');
 
     const testInputsFilePath = path.join(__dirname, 'data', 'translator-test-inputs.json');