diff --git a/06-JOS.usfm b/06-JOS.usfm
index aada081..d9a317b 100644
--- a/06-JOS.usfm
+++ b/06-JOS.usfm
@@ -9463,8 +9463,8 @@
 \w אוֹת֖⁠וֹ|lemma="אֵת" strong="H0853" x-morph="He,To:Sp3ms" \w*
 \w בְּ⁠כָל|lemma="כֹּל" strong="b:H3605" x-morph="He,R:Ncmsc" \w*־\w אֶ֣רֶץ|lemma="אֶרֶץ" strong="H0776" x-morph="He,Ncbsc" \w*
 \w כְּנָ֑עַן|lemma="כְּנַעַן" strong="H3667a" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/names/canaan" \w*
-\w ו⁠ארב|lemma="רָבָה" strong="c:H7235a" x-morph="He,C:Vhw1cs" \w*
-\f + \ft Q \ft* \w וָאַרְבֶּה֙|lemma="רָבָה" strong="c:H7235a" x-morph="He,C:Vhh1cs" \w* \f*
+\w וָאַרְבֶּה֙|lemma="רָבָה" strong="c:H7235a" x-morph="He,C:Vhw1cs" \w* 
+\f + \ft Q \ft* \w ו⁠ארב|lemma="רָבָה" strong="c:H7235a" x-morph="He,C:Vhw1cs" \w* \f*
 \w אֶת|lemma="אֵת" strong="H0853" x-morph="He,To" \w*־\w זַרְע֔⁠וֹ|lemma="זֶרַע" strong="H2233" x-morph="He,Ncmsc:Sp3ms" x-tw="rc://*/tw/dict/bible/other/seed" \w*
 \w וָֽ⁠אֶתֶּן|lemma="נָתַן" strong="c:H5414" x-morph="He,C:Vqw1cs" \w*־\w ל֖⁠וֹ|lemma="" strong="l" x-morph="He,R:Sp3ms" \w*
 \w אֶת|lemma="אֵת" strong="H0853" x-morph="He,To" \w*־\w יִצְחָֽק|lemma="יִצְחָק" strong="H3327" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/names/isaac" \w*׃
diff --git a/08-RUT.usfm b/08-RUT.usfm
index 5da239b..ce582ba 100644
--- a/08-RUT.usfm
+++ b/08-RUT.usfm
@@ -780,7 +780,7 @@
 \f + \ft Q \ft* \w שִׂמְלֹתַ֛יִךְ|lemma="שִׂמְלָה" strong="H8071" x-morph="He,Ncfsc:Sp2fs" \w* \f*
 \w עָלַ֖יִ⁠ךְ|lemma="עַל" strong="H5921a" x-morph="He,R:Sp2fs" \w*
 \w וְיָרַ֣דְתְּ|lemma="יָרַד" strong="c:H3381" x-morph="He,C:Vqq2fs" \w*
-\f + \ft K \ft* \w ו⁠ירדתי|lemma="יָרַד" strong="c:H3381" x-morph="He,C:Vqq1cs" \w* \f*
+\f + \ft K \ft* \w ו⁠ירדתי|lemma="יָרַד" strong="c:H3381" x-morph="He,C:Vqq2fs" \w* \f*
 \w הַ⁠גֹּ֑רֶן|lemma="גֹּרֶן" strong="d:H1637" x-morph="He,Td:Ncbsa" x-tw="rc://*/tw/dict/bible/other/thresh" \w*
 \w אַל|lemma="אַל" strong="H0408" x-morph="He,Tn" \w*־\w תִּוָּדְעִ֣י|lemma="יָדַע" strong="H3045" x-morph="He,VNj2fs" \w*
 \w לָ⁠אִ֔ישׁ|lemma="אִישׁ" strong="l:H0376" x-morph="He,Rd:Ncmsa" \w*
@@ -800,7 +800,7 @@
 \w וְ⁠גִלִּ֥ית|lemma="גָּלָה" strong="c:H1540" x-morph="He,C:Vpq2fs" \w*
 \w מַרְגְּלֹתָ֖י⁠ו|lemma="מַרְגְלָה" strong="H4772" x-morph="He,Ncfpc:Sp3ms" \w*
 \w וְשָׁכָ֑בְתְּ|lemma="שָׁכַב" strong="c:H7901" x-morph="He,C:Vqq2fs" \w*
-\f + \ft K \ft* \w ו⁠שכבתי|lemma="שָׁכַב" strong="c:H7901" x-morph="He,C:Vqq1cs" \w* \f*
+\f + \ft K \ft* \w ו⁠שכבתי|lemma="שָׁכַב" strong="c:H7901" x-morph="He,C:Vqq2fs" \w* \f*
 \w וְ⁠הוּא֙|lemma="הוּא" strong="c:H1931" x-morph="He,C:Pp3ms" \w*
 \w יַגִּ֣יד|lemma="נָגַד" strong="H5046" x-morph="He,Vhi3ms" \w*
 \w לָ֔⁠ךְ|lemma="" strong="l" x-morph="He,R:Sp2fs" \w*
@@ -930,12 +930,12 @@
 
 \v 14
 \w וַ⁠תִּשְׁכַּ֤ב|lemma="שָׁכַב" strong="c:H7901" x-morph="He,C:Vqw3fs" \w*
-\w מרגלת⁠ו|lemma="מַרְגְלָה" strong="H4772" x-morph="He,Ncfsc:Sp3ms" \w*
-\f + \ft Q \ft* \w מַרְגְּלוֹתָיו֙|lemma="מַרְגְלָה" strong="H4772" x-morph="He,Ncfpc:Sp3ms" \w* \f*
+\w מַרְגְּלוֹתָיו֙|lemma="מַרְגְלָה" strong="H4772" x-morph="He,Ncfpc:Sp3ms" \w*
+\f + \ft K \ft* \w מרגלת⁠ו|lemma="מַרְגְלָה" strong="H4772" x-morph="He,Ncfsc:Sp3ms" \w* \f*
 \w עַד|lemma="עַד" strong="H5704" x-morph="He,R" \w*־\w הַ⁠בֹּ֔קֶר|lemma="בֹּקֶר" strong="d:H1242" x-morph="He,Td:Ncmsa" \w*
 \w וַ⁠תָּ֕קָם|lemma="קוּם" strong="c:H6965b" x-morph="He,C:Vqw3fs" \w*
-\w ב⁠טרום|lemma="טְרוֹם" strong="b:H2958" x-morph="He,R:D" \w*
-\f + \ft Q \ft* \w בְּטֶ֛רֶם|lemma="טְרוֹם" strong="b:H2958" x-morph="He,R:D" \w* \f*
+\w בְּטֶ֛רֶם|lemma="טְרוֹם" strong="b:H2962" x-morph="He,R:D" \w* 
+\f + \ft Q \ft* \w ב⁠טרום|lemma="טְרוֹם" strong="b:H2958" x-morph="He,R:D" \w* \f*
 \w יַכִּ֥יר|lemma="נָכַר" strong="H5234a" x-morph="He,Vhi3ms" \w*
 \w אִ֖ישׁ|lemma="אִישׁ" strong="H0376" x-morph="He,Ncmsa" \w*
 \w אֶת|lemma="אֵת" strong="H0853" x-morph="He,To" \w*־\w רֵעֵ֑⁠הוּ|lemma="רֵעַ" strong="H7453" x-morph="He,Ncmsc:Sp3ms" \w*
diff --git a/10-2SA.usfm b/10-2SA.usfm
index 1bc9afc..1b437f4 100644
--- a/10-2SA.usfm
+++ b/10-2SA.usfm
@@ -8806,8 +8806,8 @@
 \w עֲמָשָׂ֖א|lemma="עֲמָשָׂא" strong="H6021" x-morph="He,Np" \w*
 \w לְ⁠הַזְעִ֣יק|lemma="זָעַק" strong="l:H2199" x-morph="He,R:Vhc" \w*
 \w אֶת|lemma="אֵת" strong="H0853" x-morph="He,To" \w*־\w יְהוּדָ֑ה|lemma="יְהוּדָה" strong="H3063" x-morph="He,Np" x-tw="rc://*/tw/dict/bible/names/judea" \w*
-\w ו⁠ייחר|lemma="אָחַר" strong="c:H0309" x-morph="He,C:Vhw3ms" \w*
-\f + \ft K \ft* \w ו⁠ייחר|lemma="אָחַר" strong="c:H0309" x-morph="He,C:Vqw3ms" \w* \f*
+\w וַיּ֕וֹחֶר|lemma="אָחַר" strong="c:H0309" x-morph="He,C:Vhw3ms" \w*
+\f + \ft K \ft* \w ו⁠ייחר|lemma="אָחַר" strong="c:H0309" x-morph="He,C:Vhw3ms" \w* \f*
 \w מִן|lemma="מִן" strong="H4480a" x-morph="He,R" \w*־\w הַ⁠מּוֹעֵ֖ד|lemma="מוֹעֵד" strong="d:H4150" x-morph="He,Td:Ncmsa" \w*
 \w אֲשֶׁ֥ר|lemma="אֲשֶׁר" strong="H0834a" x-morph="He,Tr" \w*
 \w יְעָדֽ⁠וֹ|lemma="יָעַד" strong="H3259" x-morph="He,Vqp3ms:Sp3ms" \w*׃ס
diff --git a/13-1CH.usfm b/13-1CH.usfm
index 32c7cef..5e40864 100644
--- a/13-1CH.usfm
+++ b/13-1CH.usfm
@@ -6266,8 +6266,8 @@
 \w וּ⁠בְנָיָ֤הוּ|lemma="בְּנָיָה" strong="c:H1141" x-morph="He,C:Np" \w*
 \w וֶֽ⁠אֱלִיעֶ֨זֶר֙|lemma="אֱלִיעֶזֶר" strong="c:H0461" x-morph="He,C:Np" \w*
 \w הַ⁠כֹּ֣הֲנִ֔ים|lemma="כֹּהֵן" strong="d:H3548" x-morph="He,Td:Ncmpa" x-tw="rc://*/tw/dict/bible/kt/priest" \w*
-\w מחצצרים|lemma="חָצַר" strong="H2690" x-morph="He,Vprmpa" \w*
-\f + \ft Q \ft* \w מַחְצְרִים֙|lemma="חָצַר" strong="H2690" x-morph="He,Vprmpa" \w* \f*
+\w מַחְצְרִים֙|lemma="חָצַר" strong="H2690" x-morph="He,Vprmpa" \w*
+\f + \ft Q \ft* \w מחצצרים|lemma="חצצר" strong="H2690" x-morph="He,Vprmpa" \w* \f*
 \w בַּ⁠חֲצֹ֣צְר֔וֹת|lemma="חֲצֹצְרָה" strong="b:H2689" x-morph="He,R:Ncfpa" x-tw="rc://*/tw/dict/bible/other/trumpet" \w*
 \w לִ⁠פְנֵ֖י|lemma="פָּנִים" strong="l:H6440" x-morph="He,R:Ncbpc" \w*
 \w אֲר֣וֹן|lemma="אָרוֹן" strong="H0727" x-morph="He,Ncbsc" \w*
diff --git a/14-2CH.usfm b/14-2CH.usfm
index 29bf04d..26f6e93 100644
--- a/14-2CH.usfm
+++ b/14-2CH.usfm
@@ -1405,15 +1405,15 @@
 \w כֹּֽהֲנִים֙|lemma="כֹּהֵן" strong="H3548" x-morph="He,Ncmpa" x-tw="rc://*/tw/dict/bible/kt/priest" \w*
 \w לְ⁠מֵאָ֣ה|lemma="מֵאָה" strong="l:H3967" x-morph="He,R:Acbsa" \w*
 \w וְ⁠עֶשְׂרִ֔ים|lemma="עֶשְׂרִים" strong="c:H6242" x-morph="He,C:Acbpa" \w*
-\w מחצררים|lemma="חָצַר" strong="H2690" x-morph="He,Vprmpa" \w*
-\f + \ft Q \ft* \w מַחְצְרִ֖ים|lemma="חָצַר" strong="H2690" x-morph="He,Vprmpa" \w* \f*
+\w מַחְצְרִ֖ים|lemma="חָצַר" strong="H2690" x-morph="He,Vprmpa" \w*
+\f + \ft K \ft* \w מחצררים|lemma="חצצר" strong="H2690" x-morph="He,Vprmpa" \w* \f*
 \w בַּ⁠חֲצֹֽצְרֽוֹת|lemma="חֲצֹצְרָה" strong="b:H2689" x-morph="He,R:Ncfpa" x-tw="rc://*/tw/dict/bible/other/trumpet" \w*׃
 
 \v 13
 \w וַ⁠יְהִ֣י|lemma="הָיָה" strong="c:H1961" x-morph="He,C:Vqw3ms" \w*
 \w כְ֠⁠אֶחָד|lemma="אֶחָד" strong="k:H0259" x-morph="He,R:Acmsa" \w*
-\w ל⁠מחצצרים|lemma="חָצַר" strong="l:H2690" x-morph="He,Rd:Vprmpa" \w*
-\f + \ft Q \ft* \w לַמְחַצְּרִ֨ים|lemma="חָצַר" strong="l:H2690" x-morph="He,Rd:Vprmpa" \w* \f*
+\w לַמְחַצְּרִ֨ים|lemma="חָצַר" strong="l:H2690" x-morph="He,Rd:Vprmpa" \w*
+\f + \ft K \ft* \w ל⁠מחצצרים|lemma="חצצר" strong="l:H2690" x-morph="He,Rd:Vprmpa" \w* \f*
 \w וְ⁠לַ⁠מְשֹֽׁרֲרִ֜ים|lemma="שִׁיר" strong="c:l:H7891" x-morph="He,C:Rd:Vormpa" \w*
 \w לְ⁠הַשְׁמִ֣יעַ|lemma="שָׁמַע" strong="l:H8085" x-morph="He,R:Vhc" \w*
 \w קוֹל|lemma="קוֹל" strong="H6963a" x-morph="He,Ncmsa" \w*־\w אֶחָ֗ד|lemma="אֶחָד" strong="H0259" x-morph="He,Acmsa" \w*
@@ -4411,8 +4411,8 @@
 \w וַֽ⁠יִּצְעֲק֖וּ|lemma="צָעַק" strong="c:H6817" x-morph="He,C:Vqw3mp" \w*
 \w לַ⁠יהוָ֑ה|lemma="יְהֹוָה" strong="l:H3068" x-morph="He,R:Np" x-tw="rc://*/tw/dict/bible/kt/yahweh" \w*
 \w וְ⁠הַ⁠כֹּ֣הֲנִ֔ים|lemma="כֹּהֵן" strong="c:d:H3548" x-morph="He,C:Td:Ncmpa" x-tw="rc://*/tw/dict/bible/kt/priest" \w*
-\w מחצצרים|lemma="חָצַר" strong="H2690" x-morph="He,Vprmpa" \w*
-\f + \ft Q \ft* \w מַחְצְרִ֖ים|lemma="חָצַר" strong="H2690" x-morph="He,Vprmpa" \w* \f*
+\w מַחְצְרִ֖ים|lemma="חָצַר" strong="H2690" x-morph="He,Vprmpa" \w*
+\f + \ft K \ft* \w מחצצרים|lemma="חצצר" strong="H2690" x-morph="He,Vprmpa" \w* \f*
 \w בַּ⁠חֲצֹצְרֽוֹת|lemma="חֲצֹצְרָה" strong="b:H2689" x-morph="He,R:Ncfpa" x-tw="rc://*/tw/dict/bible/other/trumpet" \w*׃
 
 \v 15
@@ -10021,8 +10021,8 @@
 \w וְ⁠הַ⁠שִּׁ֣יר|lemma="שִׁיר" strong="c:d:H7892a" x-morph="He,C:Td:Ncbsa" \w*
 \w מְשׁוֹרֵ֔ר|lemma="שִׁיר" strong="H7891" x-morph="He,Vormsa" \w*
 \w וְ⁠הַ⁠חֲצֹצְר֖וֹת|lemma="חֲצֹצְרָה" strong="c:d:H2689" x-morph="He,C:Td:Ncfpa" \w*
-\w מחצצרים|lemma="חָצַר" strong="H2690" x-morph="He,Vprmpa" \w*
-\f + \ft Q \ft* \w מַחְצְרִ֑ים|lemma="חָצַר" strong="H2690" x-morph="He,Vprmpa" \w* \f*
+\w מַחְצְרִ֑ים|lemma="חָצַר" strong="H2690" x-morph="He,Vprmpa" \w*
+\f + \ft Q \ft* \w מחצצרים|lemma="חצצר" strong="H2690" x-morph="He,Vprmpa" \w* \f*
 \w הַ⁠כֹּ֕ל|lemma="כֹּל" strong="d:H3605" x-morph="He,Td:Ncmsa" \w*
 \w עַ֖ד|lemma="עַד" strong="H5704" x-morph="He,R" \w*
 \w לִ⁠כְל֥וֹת|lemma="כָּלָה" strong="l:H3615" x-morph="He,R:Vqc" x-tw="rc://*/tw/dict/bible/kt/fulfill" \w*
diff --git a/15-EZR.usfm b/15-EZR.usfm
index ac961d3..2511573 100644
--- a/15-EZR.usfm
+++ b/15-EZR.usfm
@@ -1774,7 +1774,7 @@
 \v 15
 \w וַ⁠אֲמַר|lemma="אֲמַר" strong="c:H0560" x-morph="Ar,C:Vqp3ms" \w*־\w לֵ֓⁠הּ|lemma="" strong="l" x-morph="Ar,R:Sp3ms" \w*׀
 \w אֵ֚ל|lemma="אֵל" strong="H0412" x-morph="Ar,Pdxmp" \w*
-\f + \ft Q \ft* \w אלה|lemma="אֵל" strong="H0426" x-morph="Ar,Pdxfp" \w* \f*
+\f + \ft Q \ft* \w אלה|lemma="אֵל" strong="H0412" x-morph="Ar,Pdxfp" \w* \f*
 \w מָֽאנַיָּ֔⁠א|lemma="מָאן" strong="H3984" x-morph="Ar,Ncmpd:Td" \w*
 \w שֵׂ֚א|lemma="נְשָׂא" strong="H5376" x-morph="Ar,Vqv2ms" \w*
 \w אֵֽזֶל|lemma="אֲזַל" strong="H0236" x-morph="Ar,Vqv2ms" \w*־\w אֲחֵ֣ת|lemma="נְחַת" strong="H5182" x-morph="Ar,Vav2ms" \w*