diff --git a/machine/corpora/scripture_ref_usfm_parser_handler.py b/machine/corpora/scripture_ref_usfm_parser_handler.py
index db9081b..efd2962 100644
--- a/machine/corpora/scripture_ref_usfm_parser_handler.py
+++ b/machine/corpora/scripture_ref_usfm_parser_handler.py
@@ -89,6 +89,8 @@ def end_para(self, state: UsfmParserState, marker: str) -> None:
 
     def start_row(self, state: UsfmParserState, marker: str) -> None:
         if self._current_text_type == ScriptureTextType.NONVERSE or self._current_text_type == ScriptureTextType.NONE:
+            if self._cur_verse_ref.is_default:
+                self._update_verse_ref(state.verse_ref, marker)
             self._start_parent_element(marker)
 
     def end_row(self, state: UsfmParserState, marker: str) -> None:
@@ -106,6 +108,8 @@ def end_cell(self, state: UsfmParserState, marker: str) -> None:
             self._end_non_verse_text_wrapper(state)
 
     def start_sidebar(self, state: UsfmParserState, marker: str, category: str) -> None:
+        if self._cur_verse_ref.is_default:
+            self._update_verse_ref(state.verse_ref, marker)
         self._start_parent_element(marker)
 
     def end_sidebar(self, state: UsfmParserState, marker: str, closed: bool) -> None:
diff --git a/tests/corpora/test_usfm_memory_text.py b/tests/corpora/test_usfm_memory_text.py
index 76bdea7..183eb41 100644
--- a/tests/corpora/test_usfm_memory_text.py
+++ b/tests/corpora/test_usfm_memory_text.py
@@ -90,6 +90,49 @@ def test_get_rows_opt_break_middle_include_markers() -> None:
     assert rows[0].text == "First verse in line // More text"
 
 
+def test_get_sidebar_first_tag() -> None:
+    rows: List[TextRow] = get_rows(
+        r"""\id MAT - Test
+\esb
+\ip My sidebar text
+\esbe
+\c 1
+\p
+\v 1 First verse
+""",
+        include_all_text=True,
+        include_markers=True,
+    )
+    assert len(rows) == 3, str.join(",", [tr.text for tr in rows])
+    assert rows[0].text == "My sidebar text"
+    assert scripture_ref(rows[0]) == ScriptureRef.parse("MAT 1:0/1:esb/1:ip")
+    assert rows[1].text == ""
+    assert scripture_ref(rows[1]) == ScriptureRef.parse("MAT 1:0/2:p")
+    assert rows[2].text == "First verse"
+    assert scripture_ref(rows[2]) == ScriptureRef.parse("MAT 1:1")
+
+
+def test_get_table_row_first_tag() -> None:
+    rows: List[TextRow] = get_rows(
+        r"""\id MAT - Test
+\tr \th1 Day \th2 Tribe \th3 Leader
+\tr \tcr1 1st \tc2 Judah \tc3 Nahshon son of Amminadab
+\c 1
+\p
+\v 1 First verse
+""",
+        include_all_text=True,
+        include_markers=True,
+    )
+    assert len(rows) == 8, str.join(",", [tr.text for tr in rows])
+    assert rows[0].text == "\\th1 Day"
+    assert scripture_ref(rows[0]) == ScriptureRef.parse("MAT 1:0/1:tr/1:th1")
+    assert rows[6].text == ""
+    assert scripture_ref(rows[6]) == ScriptureRef.parse("MAT 1:0/3:p")
+    assert rows[7].text == "First verse"
+    assert scripture_ref(rows[7]) == ScriptureRef.parse("MAT 1:1")
+
+
 def test_get_rows_verse_para_beginning_non_verse_segment() -> None:
     # a verse paragraph that begins with a non-verse segment followed by a verse segment
     rows: List[TextRow] = get_rows(