diff --git a/.idea/dataSources/a2c75661-f9e2-478f-a69f-6a9409e69997.xml b/.idea/dataSources/a2c75661-f9e2-478f-a69f-6a9409e69997.xml
index e1caa5ac5..412c4d435 100644
--- a/.idea/dataSources/a2c75661-f9e2-478f-a69f-6a9409e69997.xml
+++ b/.idea/dataSources/a2c75661-f9e2-478f-a69f-6a9409e69997.xml
@@ -2,7 +2,7 @@
 <dataSource name="document.db">
   <database-model serializer="dbm" dbms="SQLITE" family-id="SQLITE" format-version="4.15">
     <root id="1">
-      <ServerVersion>3.16.1</ServerVersion>
+      <ServerVersion>3.25.1</ServerVersion>
     </root>
     <schema id="2" parent="1" name="main">
       <Current>1</Current>
@@ -56,7 +56,7 @@ contentHash UNINDEXED</Arguments>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="28" parent="6" name="dateCreated">
+    <column id="28" parent="6" name="utcDateCreated">
       <Position>3</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
@@ -76,6 +76,7 @@ contentHash UNINDEXED</Arguments>
     <index id="31" parent="6" name="sqlite_autoindex_api_tokens_1">
       <NameSurrogate>1</NameSurrogate>
       <ColNames>apiTokenId</ColNames>
+      <ColumnCollations></ColumnCollations>
       <Unique>1</Unique>
     </index>
     <key id="32" parent="6">
@@ -115,12 +116,12 @@ contentHash UNINDEXED</Arguments>
       <NotNull>1</NotNull>
       <DefaultExpression>0</DefaultExpression>
     </column>
-    <column id="39" parent="7" name="dateCreated">
+    <column id="39" parent="7" name="utcDateCreated">
       <Position>7</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="40" parent="7" name="dateModified">
+    <column id="40" parent="7" name="utcDateModified">
       <Position>8</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
@@ -144,20 +145,25 @@ contentHash UNINDEXED</Arguments>
     <index id="44" parent="7" name="sqlite_autoindex_attributes_1">
       <NameSurrogate>1</NameSurrogate>
       <ColNames>attributeId</ColNames>
+      <ColumnCollations></ColumnCollations>
       <Unique>1</Unique>
     </index>
     <index id="45" parent="7" name="IDX_attributes_noteId_index">
       <ColNames>noteId</ColNames>
+      <ColumnCollations></ColumnCollations>
     </index>
     <index id="46" parent="7" name="IDX_attributes_name_value">
       <ColNames>name
 value</ColNames>
+      <ColumnCollations></ColumnCollations>
     </index>
     <index id="47" parent="7" name="IDX_attributes_name_index">
       <ColNames>name</ColNames>
+      <ColumnCollations></ColumnCollations>
     </index>
     <index id="48" parent="7" name="IDX_attributes_value_index">
       <ColNames>value</ColNames>
+      <ColumnCollations></ColumnCollations>
     </index>
     <key id="49" parent="7">
       <ColNames>attributeId</ColNames>
@@ -198,37 +204,40 @@ value</ColNames>
       <NotNull>1</NotNull>
       <DefaultExpression>0</DefaultExpression>
     </column>
-    <column id="57" parent="8" name="dateModified">
+    <column id="57" parent="8" name="utcDateModified">
       <Position>8</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="58" parent="8" name="hash">
+    <column id="58" parent="8" name="utcDateCreated">
       <Position>9</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
+    </column>
+    <column id="59" parent="8" name="hash">
+      <Position>10</Position>
+      <DataType>TEXT|0s</DataType>
+      <NotNull>1</NotNull>
       <DefaultExpression>&quot;&quot;</DefaultExpression>
     </column>
-    <column id="59" parent="8" name="dateCreated">
-      <Position>10</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-      <DefaultExpression>&apos;1970-01-01T00:00:00.000Z&apos;</DefaultExpression>
-    </column>
     <index id="60" parent="8" name="sqlite_autoindex_branches_1">
       <NameSurrogate>1</NameSurrogate>
       <ColNames>branchId</ColNames>
+      <ColumnCollations></ColumnCollations>
       <Unique>1</Unique>
     </index>
     <index id="61" parent="8" name="IDX_branches_noteId_parentNoteId">
       <ColNames>noteId
 parentNoteId</ColNames>
+      <ColumnCollations></ColumnCollations>
     </index>
     <index id="62" parent="8" name="IDX_branches_noteId">
       <ColNames>noteId</ColNames>
+      <ColumnCollations></ColumnCollations>
     </index>
     <index id="63" parent="8" name="IDX_branches_parentNoteId">
       <ColNames>parentNoteId</ColNames>
+      <ColumnCollations></ColumnCollations>
     </index>
     <key id="64" parent="8">
       <ColNames>branchId</ColNames>
@@ -248,7 +257,7 @@ parentNoteId</ColNames>
       <Position>3</Position>
       <DataType>TEXT|0s</DataType>
     </column>
-    <column id="68" parent="9" name="dateCreated">
+    <column id="68" parent="9" name="utcDateCreated">
       <Position>4</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
@@ -256,6 +265,7 @@ parentNoteId</ColNames>
     <index id="69" parent="9" name="sqlite_autoindex_event_log_1">
       <NameSurrogate>1</NameSurrogate>
       <ColNames>eventId</ColNames>
+      <ColumnCollations></ColumnCollations>
       <Unique>1</Unique>
     </index>
     <key id="70" parent="9">
@@ -295,12 +305,12 @@ parentNoteId</ColNames>
       <NotNull>1</NotNull>
       <DefaultExpression>0</DefaultExpression>
     </column>
-    <column id="77" parent="10" name="dateCreated">
+    <column id="77" parent="10" name="utcDateCreated">
       <Position>7</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="78" parent="10" name="dateModified">
+    <column id="78" parent="10" name="utcDateModified">
       <Position>8</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
@@ -308,282 +318,293 @@ parentNoteId</ColNames>
     <index id="79" parent="10" name="sqlite_autoindex_links_1">
       <NameSurrogate>1</NameSurrogate>
       <ColNames>linkId</ColNames>
+      <ColumnCollations></ColumnCollations>
       <Unique>1</Unique>
     </index>
     <index id="80" parent="10" name="IDX_links_noteId_index">
       <ColNames>noteId</ColNames>
+      <ColumnCollations></ColumnCollations>
     </index>
     <index id="81" parent="10" name="IDX_links_targetNoteId_index">
       <ColNames>targetNoteId</ColNames>
+      <ColumnCollations></ColumnCollations>
     </index>
     <key id="82" parent="10">
       <ColNames>linkId</ColNames>
       <Primary>1</Primary>
       <UnderlyingIndexName>sqlite_autoindex_links_1</UnderlyingIndexName>
     </key>
-    <column id="83" parent="11" name="noteContentId">
+    <column id="83" parent="11" name="noteId">
       <Position>1</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="84" parent="11" name="noteId">
+    <column id="84" parent="11" name="content">
       <Position>2</Position>
       <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="85" parent="11" name="isProtected">
-      <Position>3</Position>
-      <DataType>INT|0s</DataType>
-      <NotNull>1</NotNull>
-      <DefaultExpression>0</DefaultExpression>
-    </column>
-    <column id="86" parent="11" name="content">
-      <Position>4</Position>
-      <DataType>TEXT|0s</DataType>
       <DefaultExpression>NULL</DefaultExpression>
     </column>
-    <column id="87" parent="11" name="hash">
-      <Position>5</Position>
+    <column id="85" parent="11" name="hash">
+      <Position>3</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
       <DefaultExpression>&quot;&quot;</DefaultExpression>
     </column>
-    <column id="88" parent="11" name="dateCreated">
-      <Position>6</Position>
+    <column id="86" parent="11" name="utcDateModified">
+      <Position>4</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="89" parent="11" name="dateModified">
-      <Position>7</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <index id="90" parent="11" name="sqlite_autoindex_note_contents_1">
+    <index id="87" parent="11" name="sqlite_autoindex_note_contents_1">
       <NameSurrogate>1</NameSurrogate>
-      <ColNames>noteContentId</ColNames>
-      <Unique>1</Unique>
-    </index>
-    <index id="91" parent="11" name="IDX_note_contents_noteId">
       <ColNames>noteId</ColNames>
+      <ColumnCollations></ColumnCollations>
       <Unique>1</Unique>
     </index>
-    <key id="92" parent="11">
-      <ColNames>noteContentId</ColNames>
+    <key id="88" parent="11">
+      <ColNames>noteId</ColNames>
       <Primary>1</Primary>
       <UnderlyingIndexName>sqlite_autoindex_note_contents_1</UnderlyingIndexName>
     </key>
-    <column id="93" parent="12" name="k">
+    <column id="89" parent="12" name="k">
       <Position>1</Position>
       <NotNull>1</NotNull>
     </column>
-    <column id="94" parent="12" name="v">
+    <column id="90" parent="12" name="v">
       <Position>2</Position>
     </column>
-    <index id="95" parent="12" name="sqlite_autoindex_note_fulltext_config_1">
+    <index id="91" parent="12" name="sqlite_autoindex_note_fulltext_config_1">
       <NameSurrogate>1</NameSurrogate>
       <ColNames>k</ColNames>
+      <ColumnCollations></ColumnCollations>
       <Unique>1</Unique>
     </index>
-    <key id="96" parent="12">
+    <key id="92" parent="12">
       <ColNames>k</ColNames>
       <Primary>1</Primary>
       <UnderlyingIndexName>sqlite_autoindex_note_fulltext_config_1</UnderlyingIndexName>
     </key>
-    <column id="97" parent="13" name="id">
+    <column id="93" parent="13" name="id">
       <Position>1</Position>
       <DataType>INTEGER|0s</DataType>
     </column>
-    <column id="98" parent="13" name="c0">
+    <column id="94" parent="13" name="c0">
       <Position>2</Position>
     </column>
-    <column id="99" parent="13" name="c1">
+    <column id="95" parent="13" name="c1">
       <Position>3</Position>
     </column>
-    <column id="100" parent="13" name="c2">
+    <column id="96" parent="13" name="c2">
       <Position>4</Position>
     </column>
-    <column id="101" parent="13" name="c3">
+    <column id="97" parent="13" name="c3">
       <Position>5</Position>
     </column>
-    <column id="102" parent="13" name="c4">
+    <column id="98" parent="13" name="c4">
       <Position>6</Position>
     </column>
-    <key id="103" parent="13">
+    <key id="99" parent="13">
       <ColNames>id</ColNames>
       <Primary>1</Primary>
     </key>
-    <column id="104" parent="14" name="id">
+    <column id="100" parent="14" name="id">
       <Position>1</Position>
       <DataType>INTEGER|0s</DataType>
     </column>
-    <column id="105" parent="14" name="block">
+    <column id="101" parent="14" name="block">
       <Position>2</Position>
       <DataType>BLOB|0s</DataType>
     </column>
-    <key id="106" parent="14">
+    <key id="102" parent="14">
       <ColNames>id</ColNames>
       <Primary>1</Primary>
     </key>
-    <column id="107" parent="15" name="id">
+    <column id="103" parent="15" name="id">
       <Position>1</Position>
       <DataType>INTEGER|0s</DataType>
     </column>
-    <column id="108" parent="15" name="sz">
+    <column id="104" parent="15" name="sz">
       <Position>2</Position>
       <DataType>BLOB|0s</DataType>
     </column>
-    <key id="109" parent="15">
+    <key id="105" parent="15">
       <ColNames>id</ColNames>
       <Primary>1</Primary>
     </key>
-    <column id="110" parent="16" name="segid">
+    <column id="106" parent="16" name="segid">
       <Position>1</Position>
       <NotNull>1</NotNull>
     </column>
-    <column id="111" parent="16" name="term">
+    <column id="107" parent="16" name="term">
       <Position>2</Position>
       <NotNull>1</NotNull>
     </column>
-    <column id="112" parent="16" name="pgno">
+    <column id="108" parent="16" name="pgno">
       <Position>3</Position>
     </column>
-    <index id="113" parent="16" name="sqlite_autoindex_note_fulltext_idx_1">
+    <index id="109" parent="16" name="sqlite_autoindex_note_fulltext_idx_1">
       <NameSurrogate>1</NameSurrogate>
       <ColNames>segid
 term</ColNames>
+      <ColumnCollations></ColumnCollations>
       <Unique>1</Unique>
     </index>
-    <key id="114" parent="16">
+    <key id="110" parent="16">
       <ColNames>segid
 term</ColNames>
       <Primary>1</Primary>
       <UnderlyingIndexName>sqlite_autoindex_note_fulltext_idx_1</UnderlyingIndexName>
     </key>
-    <column id="115" parent="17" name="noteRevisionId">
+    <column id="111" parent="17" name="noteRevisionId">
       <Position>1</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="116" parent="17" name="noteId">
+    <column id="112" parent="17" name="noteId">
       <Position>2</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="117" parent="17" name="title">
+    <column id="113" parent="17" name="title">
       <Position>3</Position>
       <DataType>TEXT|0s</DataType>
     </column>
-    <column id="118" parent="17" name="content">
+    <column id="114" parent="17" name="content">
       <Position>4</Position>
       <DataType>TEXT|0s</DataType>
     </column>
-    <column id="119" parent="17" name="isProtected">
+    <column id="115" parent="17" name="isProtected">
       <Position>5</Position>
       <DataType>INT|0s</DataType>
       <NotNull>1</NotNull>
       <DefaultExpression>0</DefaultExpression>
     </column>
-    <column id="120" parent="17" name="dateModifiedFrom">
+    <column id="116" parent="17" name="utcDateModifiedFrom">
       <Position>6</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="121" parent="17" name="dateModifiedTo">
+    <column id="117" parent="17" name="utcDateModifiedTo">
       <Position>7</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="122" parent="17" name="type">
+    <column id="118" parent="17" name="dateModifiedFrom">
       <Position>8</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
-      <DefaultExpression>&apos;&apos;</DefaultExpression>
     </column>
-    <column id="123" parent="17" name="mime">
+    <column id="119" parent="17" name="dateModifiedTo">
       <Position>9</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
+    </column>
+    <column id="120" parent="17" name="type">
+      <Position>10</Position>
+      <DataType>TEXT|0s</DataType>
+      <NotNull>1</NotNull>
       <DefaultExpression>&apos;&apos;</DefaultExpression>
     </column>
-    <column id="124" parent="17" name="hash">
-      <Position>10</Position>
+    <column id="121" parent="17" name="mime">
+      <Position>11</Position>
+      <DataType>TEXT|0s</DataType>
+      <NotNull>1</NotNull>
+      <DefaultExpression>&apos;&apos;</DefaultExpression>
+    </column>
+    <column id="122" parent="17" name="hash">
+      <Position>12</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
       <DefaultExpression>&quot;&quot;</DefaultExpression>
     </column>
-    <index id="125" parent="17" name="sqlite_autoindex_note_revisions_1">
+    <index id="123" parent="17" name="sqlite_autoindex_note_revisions_1">
       <NameSurrogate>1</NameSurrogate>
       <ColNames>noteRevisionId</ColNames>
+      <ColumnCollations></ColumnCollations>
       <Unique>1</Unique>
     </index>
-    <index id="126" parent="17" name="IDX_note_revisions_noteId">
+    <index id="124" parent="17" name="IDX_note_revisions_noteId">
       <ColNames>noteId</ColNames>
+      <ColumnCollations></ColumnCollations>
     </index>
-    <index id="127" parent="17" name="IDX_note_revisions_dateModifiedFrom">
-      <ColNames>dateModifiedFrom</ColNames>
+    <index id="125" parent="17" name="IDX_note_revisions_dateModifiedFrom">
+      <ColNames>utcDateModifiedFrom</ColNames>
+      <ColumnCollations></ColumnCollations>
     </index>
-    <index id="128" parent="17" name="IDX_note_revisions_dateModifiedTo">
-      <ColNames>dateModifiedTo</ColNames>
+    <index id="126" parent="17" name="IDX_note_revisions_dateModifiedTo">
+      <ColNames>utcDateModifiedTo</ColNames>
+      <ColumnCollations></ColumnCollations>
     </index>
-    <key id="129" parent="17">
+    <key id="127" parent="17">
       <ColNames>noteRevisionId</ColNames>
       <Primary>1</Primary>
       <UnderlyingIndexName>sqlite_autoindex_note_revisions_1</UnderlyingIndexName>
     </key>
-    <column id="130" parent="18" name="noteId">
+    <column id="128" parent="18" name="noteId">
       <Position>1</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="131" parent="18" name="title">
+    <column id="129" parent="18" name="title">
       <Position>2</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
       <DefaultExpression>&quot;note&quot;</DefaultExpression>
     </column>
-    <column id="132" parent="18" name="isProtected">
+    <column id="130" parent="18" name="isProtected">
       <Position>3</Position>
       <DataType>INT|0s</DataType>
       <NotNull>1</NotNull>
       <DefaultExpression>0</DefaultExpression>
     </column>
-    <column id="133" parent="18" name="type">
+    <column id="131" parent="18" name="type">
       <Position>4</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
       <DefaultExpression>&apos;text&apos;</DefaultExpression>
     </column>
-    <column id="134" parent="18" name="mime">
+    <column id="132" parent="18" name="mime">
       <Position>5</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
       <DefaultExpression>&apos;text/html&apos;</DefaultExpression>
     </column>
-    <column id="135" parent="18" name="hash">
+    <column id="133" parent="18" name="hash">
       <Position>6</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
       <DefaultExpression>&quot;&quot;</DefaultExpression>
     </column>
-    <column id="136" parent="18" name="isDeleted">
+    <column id="134" parent="18" name="isDeleted">
       <Position>7</Position>
       <DataType>INT|0s</DataType>
       <NotNull>1</NotNull>
       <DefaultExpression>0</DefaultExpression>
     </column>
-    <column id="137" parent="18" name="dateCreated">
+    <column id="135" parent="18" name="dateCreated">
       <Position>8</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="138" parent="18" name="dateModified">
+    <column id="136" parent="18" name="dateModified">
       <Position>9</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
     </column>
+    <column id="137" parent="18" name="utcDateCreated">
+      <Position>10</Position>
+      <DataType>TEXT|0s</DataType>
+      <NotNull>1</NotNull>
+    </column>
+    <column id="138" parent="18" name="utcDateModified">
+      <Position>11</Position>
+      <DataType>TEXT|0s</DataType>
+      <NotNull>1</NotNull>
+    </column>
     <index id="139" parent="18" name="sqlite_autoindex_notes_1">
       <NameSurrogate>1</NameSurrogate>
       <ColNames>noteId</ColNames>
+      <ColumnCollations></ColumnCollations>
       <Unique>1</Unique>
     </index>
     <key id="140" parent="18">
@@ -600,31 +621,32 @@ term</ColNames>
       <Position>2</Position>
       <DataType>TEXT|0s</DataType>
     </column>
-    <column id="143" parent="19" name="dateModified">
+    <column id="143" parent="19" name="isSynced">
       <Position>3</Position>
-      <DataType>INT|0s</DataType>
-    </column>
-    <column id="144" parent="19" name="isSynced">
-      <Position>4</Position>
       <DataType>INTEGER|0s</DataType>
       <NotNull>1</NotNull>
       <DefaultExpression>0</DefaultExpression>
     </column>
-    <column id="145" parent="19" name="hash">
-      <Position>5</Position>
+    <column id="144" parent="19" name="hash">
+      <Position>4</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
       <DefaultExpression>&quot;&quot;</DefaultExpression>
     </column>
-    <column id="146" parent="19" name="dateCreated">
+    <column id="145" parent="19" name="utcDateCreated">
+      <Position>5</Position>
+      <DataType>TEXT|0s</DataType>
+      <NotNull>1</NotNull>
+    </column>
+    <column id="146" parent="19" name="utcDateModified">
       <Position>6</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
-      <DefaultExpression>&apos;1970-01-01T00:00:00.000Z&apos;</DefaultExpression>
     </column>
     <index id="147" parent="19" name="sqlite_autoindex_options_1">
       <NameSurrogate>1</NameSurrogate>
       <ColNames>name</ColNames>
+      <ColumnCollations></ColumnCollations>
       <Unique>1</Unique>
     </index>
     <key id="148" parent="19">
@@ -648,7 +670,7 @@ term</ColNames>
       <NotNull>1</NotNull>
       <DefaultExpression>&quot;&quot;</DefaultExpression>
     </column>
-    <column id="152" parent="20" name="dateCreated">
+    <column id="152" parent="20" name="utcDateCreated">
       <Position>4</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
@@ -660,6 +682,7 @@ term</ColNames>
     <index id="154" parent="20" name="sqlite_autoindex_recent_notes_1">
       <NameSurrogate>1</NameSurrogate>
       <ColNames>branchId</ColNames>
+      <ColumnCollations></ColumnCollations>
       <Unique>1</Unique>
     </index>
     <key id="155" parent="20">
@@ -672,7 +695,7 @@ term</ColNames>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="157" parent="21" name="dateCreated">
+    <column id="157" parent="21" name="utcDateCreated">
       <Position>2</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
@@ -680,6 +703,7 @@ term</ColNames>
     <index id="158" parent="21" name="sqlite_autoindex_source_ids_1">
       <NameSurrogate>1</NameSurrogate>
       <ColNames>sourceId</ColNames>
+      <ColumnCollations></ColumnCollations>
       <Unique>1</Unique>
     </index>
     <key id="159" parent="21">
@@ -701,7 +725,7 @@ term</ColNames>
     </column>
     <column id="163" parent="22" name="rootpage">
       <Position>4</Position>
-      <DataType>integer|0s</DataType>
+      <DataType>int|0s</DataType>
     </column>
     <column id="164" parent="22" name="sql">
       <Position>5</Position>
@@ -734,7 +758,7 @@ term</ColNames>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="171" parent="24" name="syncDate">
+    <column id="171" parent="24" name="utcSyncDate">
       <Position>5</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
@@ -742,10 +766,12 @@ term</ColNames>
     <index id="172" parent="24" name="IDX_sync_entityName_entityId">
       <ColNames>entityName
 entityId</ColNames>
+      <ColumnCollations></ColumnCollations>
       <Unique>1</Unique>
     </index>
-    <index id="173" parent="24" name="IDX_sync_syncDate">
-      <ColNames>syncDate</ColNames>
+    <index id="173" parent="24" name="IDX_sync_utcSyncDate">
+      <ColNames>utcSyncDate</ColNames>
+      <ColumnCollations></ColumnCollations>
     </index>
     <key id="174" parent="24">
       <ColNames>id</ColNames>
diff --git a/db/migrations/0131__rename_dates_to_utc.sql b/db/migrations/0130__rename_dates_to_utc.sql
similarity index 100%
rename from db/migrations/0131__rename_dates_to_utc.sql
rename to db/migrations/0130__rename_dates_to_utc.sql
diff --git a/db/migrations/0130__cleanup_note_contents.sql b/db/migrations/0131__cleanup_note_contents.sql
similarity index 100%
rename from db/migrations/0130__cleanup_note_contents.sql
rename to db/migrations/0131__cleanup_note_contents.sql
diff --git a/package-lock.json b/package-lock.json
index 3e28c4546..9151eea3c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "trilium",
-  "version": "0.30.5",
+  "version": "0.30.7",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {