diff --git a/.idea/dataSources/a2c75661-f9e2-478f-a69f-6a9409e69997.xml b/.idea/dataSources/a2c75661-f9e2-478f-a69f-6a9409e69997.xml
index b28d70ee3..9ef2d1595 100644
--- a/.idea/dataSources/a2c75661-f9e2-478f-a69f-6a9409e69997.xml
+++ b/.idea/dataSources/a2c75661-f9e2-478f-a69f-6a9409e69997.xml
@@ -17,736 +17,657 @@
     <table id="9" parent="2" name="event_log"/>
     <table id="10" parent="2" name="links"/>
     <table id="11" parent="2" name="note_contents"/>
-    <table id="12" parent="2" name="note_fulltext_config">
-      <WithoutRowId>1</WithoutRowId>
-    </table>
-    <table id="13" parent="2" name="note_fulltext_content"/>
-    <table id="14" parent="2" name="note_fulltext_data"/>
-    <table id="15" parent="2" name="note_fulltext_docsize"/>
-    <table id="16" parent="2" name="note_fulltext_idx">
-      <WithoutRowId>1</WithoutRowId>
-    </table>
-    <table id="17" parent="2" name="note_revisions"/>
-    <table id="18" parent="2" name="notes"/>
-    <table id="19" parent="2" name="options"/>
-    <table id="20" parent="2" name="recent_notes"/>
-    <table id="21" parent="2" name="source_ids"/>
-    <table id="22" parent="2" name="sqlite_master">
+    <table id="12" parent="2" name="note_revisions"/>
+    <table id="13" parent="2" name="notes"/>
+    <table id="14" parent="2" name="options"/>
+    <table id="15" parent="2" name="recent_notes"/>
+    <table id="16" parent="2" name="source_ids"/>
+    <table id="17" parent="2" name="sqlite_master">
       <System>1</System>
     </table>
-    <table id="23" parent="2" name="sqlite_sequence">
+    <table id="18" parent="2" name="sqlite_sequence">
       <System>1</System>
     </table>
-    <table id="24" parent="2" name="sync"/>
-    <virtual-table id="25" parent="2" name="note_fulltext">
-      <Module>fts5</Module>
-      <Arguments>noteId UNINDEXED
-title
-titleHash UNINDEXED
-content
-contentHash UNINDEXED</Arguments>
-    </virtual-table>
-    <column id="26" parent="6" name="apiTokenId">
+    <table id="19" parent="2" name="sync"/>
+    <column id="20" parent="6" name="apiTokenId">
       <Position>1</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="27" parent="6" name="token">
+    <column id="21" parent="6" name="token">
       <Position>2</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="28" parent="6" name="utcDateCreated">
+    <column id="22" parent="6" name="utcDateCreated">
       <Position>3</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="29" parent="6" name="isDeleted">
+    <column id="23" parent="6" name="isDeleted">
       <Position>4</Position>
       <DataType>INT|0s</DataType>
       <NotNull>1</NotNull>
       <DefaultExpression>0</DefaultExpression>
     </column>
-    <column id="30" parent="6" name="hash">
+    <column id="24" parent="6" name="hash">
       <Position>5</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
       <DefaultExpression>&quot;&quot;</DefaultExpression>
     </column>
-    <index id="31" parent="6" name="sqlite_autoindex_api_tokens_1">
+    <index id="25" 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">
+    <key id="26" parent="6">
       <ColNames>apiTokenId</ColNames>
       <Primary>1</Primary>
       <UnderlyingIndexName>sqlite_autoindex_api_tokens_1</UnderlyingIndexName>
     </key>
-    <column id="33" parent="7" name="attributeId">
+    <column id="27" parent="7" name="attributeId">
       <Position>1</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="34" parent="7" name="noteId">
+    <column id="28" parent="7" name="noteId">
       <Position>2</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="35" parent="7" name="type">
+    <column id="29" parent="7" name="type">
       <Position>3</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="36" parent="7" name="name">
+    <column id="30" parent="7" name="name">
       <Position>4</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="37" parent="7" name="value">
+    <column id="31" parent="7" name="value">
       <Position>5</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
       <DefaultExpression>&apos;&apos;</DefaultExpression>
     </column>
-    <column id="38" parent="7" name="position">
+    <column id="32" parent="7" name="position">
       <Position>6</Position>
       <DataType>INT|0s</DataType>
       <NotNull>1</NotNull>
       <DefaultExpression>0</DefaultExpression>
     </column>
-    <column id="39" parent="7" name="utcDateCreated">
+    <column id="33" parent="7" name="utcDateCreated">
       <Position>7</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="40" parent="7" name="utcDateModified">
+    <column id="34" parent="7" name="utcDateModified">
       <Position>8</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="41" parent="7" name="isDeleted">
+    <column id="35" parent="7" name="isDeleted">
       <Position>9</Position>
       <DataType>INT|0s</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="42" parent="7" name="hash">
+    <column id="36" parent="7" name="hash">
       <Position>10</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
       <DefaultExpression>&quot;&quot;</DefaultExpression>
     </column>
-    <column id="43" parent="7" name="isInheritable">
+    <column id="37" parent="7" name="isInheritable">
       <Position>11</Position>
       <DataType>int|0s</DataType>
       <DefaultExpression>0</DefaultExpression>
     </column>
-    <index id="44" parent="7" name="sqlite_autoindex_attributes_1">
+    <index id="38" 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">
+    <index id="39" parent="7" name="IDX_attributes_noteId_index">
       <ColNames>noteId</ColNames>
+      <ColumnCollations></ColumnCollations>
     </index>
-    <index id="46" parent="7" name="IDX_attributes_name_value">
+    <index id="40" parent="7" name="IDX_attributes_name_value">
       <ColNames>name
 value</ColNames>
+      <ColumnCollations></ColumnCollations>
     </index>
-    <index id="47" parent="7" name="IDX_attributes_name_index">
+    <index id="41" parent="7" name="IDX_attributes_name_index">
       <ColNames>name</ColNames>
+      <ColumnCollations></ColumnCollations>
     </index>
-    <index id="48" parent="7" name="IDX_attributes_value_index">
+    <index id="42" parent="7" name="IDX_attributes_value_index">
       <ColNames>value</ColNames>
+      <ColumnCollations></ColumnCollations>
     </index>
-    <key id="49" parent="7">
+    <key id="43" parent="7">
       <ColNames>attributeId</ColNames>
       <Primary>1</Primary>
       <UnderlyingIndexName>sqlite_autoindex_attributes_1</UnderlyingIndexName>
     </key>
-    <column id="50" parent="8" name="branchId">
+    <column id="44" parent="8" name="branchId">
       <Position>1</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="51" parent="8" name="noteId">
+    <column id="45" parent="8" name="noteId">
       <Position>2</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="52" parent="8" name="parentNoteId">
+    <column id="46" parent="8" name="parentNoteId">
       <Position>3</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="53" parent="8" name="notePosition">
+    <column id="47" parent="8" name="notePosition">
       <Position>4</Position>
       <DataType>INTEGER|0s</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="54" parent="8" name="prefix">
+    <column id="48" parent="8" name="prefix">
       <Position>5</Position>
       <DataType>TEXT|0s</DataType>
     </column>
-    <column id="55" parent="8" name="isExpanded">
+    <column id="49" parent="8" name="isExpanded">
       <Position>6</Position>
       <DataType>BOOLEAN|0s</DataType>
     </column>
-    <column id="56" parent="8" name="isDeleted">
+    <column id="50" parent="8" name="isDeleted">
       <Position>7</Position>
       <DataType>INTEGER|0s</DataType>
       <NotNull>1</NotNull>
       <DefaultExpression>0</DefaultExpression>
     </column>
-    <column id="57" parent="8" name="utcDateModified">
+    <column id="51" parent="8" name="utcDateModified">
       <Position>8</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="58" parent="8" name="utcDateCreated">
+    <column id="52" parent="8" name="utcDateCreated">
       <Position>9</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="59" parent="8" name="hash">
+    <column id="53" parent="8" name="hash">
       <Position>10</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
       <DefaultExpression>&quot;&quot;</DefaultExpression>
     </column>
-    <index id="60" parent="8" name="sqlite_autoindex_branches_1">
+    <index id="54" 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">
+    <index id="55" parent="8" name="IDX_branches_noteId_parentNoteId">
       <ColNames>noteId
 parentNoteId</ColNames>
+      <ColumnCollations></ColumnCollations>
     </index>
-    <index id="62" parent="8" name="IDX_branches_noteId">
+    <index id="56" parent="8" name="IDX_branches_noteId">
       <ColNames>noteId</ColNames>
+      <ColumnCollations></ColumnCollations>
     </index>
-    <index id="63" parent="8" name="IDX_branches_parentNoteId">
+    <index id="57" parent="8" name="IDX_branches_parentNoteId">
       <ColNames>parentNoteId</ColNames>
+      <ColumnCollations></ColumnCollations>
     </index>
-    <key id="64" parent="8">
+    <key id="58" parent="8">
       <ColNames>branchId</ColNames>
       <Primary>1</Primary>
       <UnderlyingIndexName>sqlite_autoindex_branches_1</UnderlyingIndexName>
     </key>
-    <column id="65" parent="9" name="eventId">
+    <column id="59" parent="9" name="eventId">
       <Position>1</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="66" parent="9" name="noteId">
+    <column id="60" parent="9" name="noteId">
       <Position>2</Position>
       <DataType>TEXT|0s</DataType>
     </column>
-    <column id="67" parent="9" name="comment">
+    <column id="61" parent="9" name="comment">
       <Position>3</Position>
       <DataType>TEXT|0s</DataType>
     </column>
-    <column id="68" parent="9" name="utcDateCreated">
+    <column id="62" parent="9" name="utcDateCreated">
       <Position>4</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
     </column>
-    <index id="69" parent="9" name="sqlite_autoindex_event_log_1">
+    <index id="63" 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">
+    <key id="64" parent="9">
       <ColNames>eventId</ColNames>
       <Primary>1</Primary>
       <UnderlyingIndexName>sqlite_autoindex_event_log_1</UnderlyingIndexName>
     </key>
-    <column id="71" parent="10" name="linkId">
+    <column id="65" parent="10" name="linkId">
       <Position>1</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="72" parent="10" name="noteId">
+    <column id="66" parent="10" name="noteId">
       <Position>2</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="73" parent="10" name="targetNoteId">
+    <column id="67" parent="10" name="targetNoteId">
       <Position>3</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="74" parent="10" name="type">
+    <column id="68" parent="10" name="type">
       <Position>4</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="75" parent="10" name="hash">
+    <column id="69" parent="10" name="hash">
       <Position>5</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
       <DefaultExpression>&quot;&quot;</DefaultExpression>
     </column>
-    <column id="76" parent="10" name="isDeleted">
+    <column id="70" parent="10" name="isDeleted">
       <Position>6</Position>
       <DataType>INTEGER|0s</DataType>
       <NotNull>1</NotNull>
       <DefaultExpression>0</DefaultExpression>
     </column>
-    <column id="77" parent="10" name="utcDateCreated">
+    <column id="71" parent="10" name="utcDateCreated">
       <Position>7</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="78" parent="10" name="utcDateModified">
+    <column id="72" parent="10" name="utcDateModified">
       <Position>8</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
     </column>
-    <index id="79" parent="10" name="sqlite_autoindex_links_1">
+    <index id="73" 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">
+    <index id="74" parent="10" name="IDX_links_noteId_index">
       <ColNames>noteId</ColNames>
+      <ColumnCollations></ColumnCollations>
     </index>
-    <index id="81" parent="10" name="IDX_links_targetNoteId_index">
+    <index id="75" parent="10" name="IDX_links_targetNoteId_index">
       <ColNames>targetNoteId</ColNames>
+      <ColumnCollations></ColumnCollations>
     </index>
-    <key id="82" parent="10">
+    <key id="76" parent="10">
       <ColNames>linkId</ColNames>
       <Primary>1</Primary>
       <UnderlyingIndexName>sqlite_autoindex_links_1</UnderlyingIndexName>
     </key>
-    <column id="83" parent="11" name="noteId">
+    <column id="77" parent="11" name="noteId">
       <Position>1</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="84" parent="11" name="content">
+    <column id="78" parent="11" name="content">
       <Position>2</Position>
       <DataType>TEXT|0s</DataType>
       <DefaultExpression>NULL</DefaultExpression>
     </column>
-    <column id="85" parent="11" name="hash">
+    <column id="79" parent="11" name="hash">
       <Position>3</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
       <DefaultExpression>&quot;&quot;</DefaultExpression>
     </column>
-    <column id="86" parent="11" name="utcDateModified">
+    <column id="80" parent="11" name="utcDateModified">
       <Position>4</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
     </column>
-    <index id="87" parent="11" name="sqlite_autoindex_note_contents_1">
+    <index id="81" parent="11" name="sqlite_autoindex_note_contents_1">
       <NameSurrogate>1</NameSurrogate>
       <ColNames>noteId</ColNames>
+      <ColumnCollations></ColumnCollations>
       <Unique>1</Unique>
     </index>
-    <key id="88" parent="11">
+    <key id="82" parent="11">
       <ColNames>noteId</ColNames>
       <Primary>1</Primary>
       <UnderlyingIndexName>sqlite_autoindex_note_contents_1</UnderlyingIndexName>
     </key>
-    <column id="89" parent="12" name="k">
-      <Position>1</Position>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="90" parent="12" name="v">
-      <Position>2</Position>
-    </column>
-    <index id="91" parent="12" name="sqlite_autoindex_note_fulltext_config_1">
-      <NameSurrogate>1</NameSurrogate>
-      <ColNames>k</ColNames>
-      <Unique>1</Unique>
-    </index>
-    <key id="92" parent="12">
-      <ColNames>k</ColNames>
-      <Primary>1</Primary>
-      <UnderlyingIndexName>sqlite_autoindex_note_fulltext_config_1</UnderlyingIndexName>
-    </key>
-    <column id="93" parent="13" name="id">
-      <Position>1</Position>
-      <DataType>INTEGER|0s</DataType>
-    </column>
-    <column id="94" parent="13" name="c0">
-      <Position>2</Position>
-    </column>
-    <column id="95" parent="13" name="c1">
-      <Position>3</Position>
-    </column>
-    <column id="96" parent="13" name="c2">
-      <Position>4</Position>
-    </column>
-    <column id="97" parent="13" name="c3">
-      <Position>5</Position>
-    </column>
-    <column id="98" parent="13" name="c4">
-      <Position>6</Position>
-    </column>
-    <key id="99" parent="13">
-      <ColNames>id</ColNames>
-      <Primary>1</Primary>
-    </key>
-    <column id="100" parent="14" name="id">
-      <Position>1</Position>
-      <DataType>INTEGER|0s</DataType>
-    </column>
-    <column id="101" parent="14" name="block">
-      <Position>2</Position>
-      <DataType>BLOB|0s</DataType>
-    </column>
-    <key id="102" parent="14">
-      <ColNames>id</ColNames>
-      <Primary>1</Primary>
-    </key>
-    <column id="103" parent="15" name="id">
-      <Position>1</Position>
-      <DataType>INTEGER|0s</DataType>
-    </column>
-    <column id="104" parent="15" name="sz">
-      <Position>2</Position>
-      <DataType>BLOB|0s</DataType>
-    </column>
-    <key id="105" parent="15">
-      <ColNames>id</ColNames>
-      <Primary>1</Primary>
-    </key>
-    <column id="106" parent="16" name="segid">
-      <Position>1</Position>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="107" parent="16" name="term">
-      <Position>2</Position>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="108" parent="16" name="pgno">
-      <Position>3</Position>
-    </column>
-    <index id="109" parent="16" name="sqlite_autoindex_note_fulltext_idx_1">
-      <NameSurrogate>1</NameSurrogate>
-      <ColNames>segid
-term</ColNames>
-      <Unique>1</Unique>
-    </index>
-    <key id="110" parent="16">
-      <ColNames>segid
-term</ColNames>
-      <Primary>1</Primary>
-      <UnderlyingIndexName>sqlite_autoindex_note_fulltext_idx_1</UnderlyingIndexName>
-    </key>
-    <column id="111" parent="17" name="noteRevisionId">
+    <column id="83" parent="12" name="noteRevisionId">
       <Position>1</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="112" parent="17" name="noteId">
+    <column id="84" parent="12" name="noteId">
       <Position>2</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="113" parent="17" name="title">
+    <column id="85" parent="12" name="title">
       <Position>3</Position>
       <DataType>TEXT|0s</DataType>
     </column>
-    <column id="114" parent="17" name="content">
+    <column id="86" parent="12" name="content">
       <Position>4</Position>
       <DataType>TEXT|0s</DataType>
     </column>
-    <column id="115" parent="17" name="isProtected">
+    <column id="87" parent="12" name="isProtected">
       <Position>5</Position>
       <DataType>INT|0s</DataType>
       <NotNull>1</NotNull>
       <DefaultExpression>0</DefaultExpression>
     </column>
-    <column id="116" parent="17" name="utcDateModifiedFrom">
+    <column id="88" parent="12" name="utcDateModifiedFrom">
       <Position>6</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="117" parent="17" name="utcDateModifiedTo">
+    <column id="89" parent="12" name="utcDateModifiedTo">
       <Position>7</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="118" parent="17" name="dateModifiedFrom">
+    <column id="90" parent="12" name="dateModifiedFrom">
       <Position>8</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="119" parent="17" name="dateModifiedTo">
+    <column id="91" parent="12" name="dateModifiedTo">
       <Position>9</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="120" parent="17" name="type">
+    <column id="92" parent="12" name="type">
       <Position>10</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
       <DefaultExpression>&apos;&apos;</DefaultExpression>
     </column>
-    <column id="121" parent="17" name="mime">
+    <column id="93" parent="12" name="mime">
       <Position>11</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
       <DefaultExpression>&apos;&apos;</DefaultExpression>
     </column>
-    <column id="122" parent="17" name="hash">
+    <column id="94" parent="12" name="hash">
       <Position>12</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
       <DefaultExpression>&quot;&quot;</DefaultExpression>
     </column>
-    <index id="123" parent="17" name="sqlite_autoindex_note_revisions_1">
+    <index id="95" parent="12" name="sqlite_autoindex_note_revisions_1">
       <NameSurrogate>1</NameSurrogate>
       <ColNames>noteRevisionId</ColNames>
+      <ColumnCollations></ColumnCollations>
       <Unique>1</Unique>
     </index>
-    <index id="124" parent="17" name="IDX_note_revisions_noteId">
+    <index id="96" parent="12" name="IDX_note_revisions_noteId">
       <ColNames>noteId</ColNames>
+      <ColumnCollations></ColumnCollations>
     </index>
-    <index id="125" parent="17" name="IDX_note_revisions_dateModifiedFrom">
+    <index id="97" parent="12" name="IDX_note_revisions_dateModifiedFrom">
       <ColNames>utcDateModifiedFrom</ColNames>
+      <ColumnCollations></ColumnCollations>
     </index>
-    <index id="126" parent="17" name="IDX_note_revisions_dateModifiedTo">
+    <index id="98" parent="12" name="IDX_note_revisions_dateModifiedTo">
       <ColNames>utcDateModifiedTo</ColNames>
+      <ColumnCollations></ColumnCollations>
     </index>
-    <key id="127" parent="17">
+    <key id="99" parent="12">
       <ColNames>noteRevisionId</ColNames>
       <Primary>1</Primary>
       <UnderlyingIndexName>sqlite_autoindex_note_revisions_1</UnderlyingIndexName>
     </key>
-    <column id="128" parent="18" name="noteId">
+    <column id="100" parent="13" name="noteId">
       <Position>1</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="129" parent="18" name="title">
+    <column id="101" parent="13" name="title">
       <Position>2</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
       <DefaultExpression>&quot;note&quot;</DefaultExpression>
     </column>
-    <column id="130" parent="18" name="isProtected">
+    <column id="102" parent="13" name="isProtected">
       <Position>3</Position>
       <DataType>INT|0s</DataType>
       <NotNull>1</NotNull>
       <DefaultExpression>0</DefaultExpression>
     </column>
-    <column id="131" parent="18" name="type">
+    <column id="103" parent="13" name="type">
       <Position>4</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
       <DefaultExpression>&apos;text&apos;</DefaultExpression>
     </column>
-    <column id="132" parent="18" name="mime">
+    <column id="104" parent="13" name="mime">
       <Position>5</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
       <DefaultExpression>&apos;text/html&apos;</DefaultExpression>
     </column>
-    <column id="133" parent="18" name="hash">
+    <column id="105" parent="13" name="hash">
       <Position>6</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
       <DefaultExpression>&quot;&quot;</DefaultExpression>
     </column>
-    <column id="134" parent="18" name="isDeleted">
+    <column id="106" parent="13" name="isDeleted">
       <Position>7</Position>
       <DataType>INT|0s</DataType>
       <NotNull>1</NotNull>
       <DefaultExpression>0</DefaultExpression>
     </column>
-    <column id="135" parent="18" name="dateCreated">
+    <column id="107" parent="13" name="dateCreated">
       <Position>8</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="136" parent="18" name="dateModified">
+    <column id="108" parent="13" name="dateModified">
       <Position>9</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="137" parent="18" name="utcDateCreated">
+    <column id="109" parent="13" name="utcDateCreated">
       <Position>10</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="138" parent="18" name="utcDateModified">
+    <column id="110" parent="13" name="utcDateModified">
       <Position>11</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
     </column>
-    <index id="139" parent="18" name="sqlite_autoindex_notes_1">
+    <index id="111" parent="13" name="sqlite_autoindex_notes_1">
       <NameSurrogate>1</NameSurrogate>
       <ColNames>noteId</ColNames>
+      <ColumnCollations></ColumnCollations>
       <Unique>1</Unique>
     </index>
-    <key id="140" parent="18">
+    <key id="112" parent="13">
       <ColNames>noteId</ColNames>
       <Primary>1</Primary>
       <UnderlyingIndexName>sqlite_autoindex_notes_1</UnderlyingIndexName>
     </key>
-    <column id="141" parent="19" name="name">
+    <column id="113" parent="14" name="name">
       <Position>1</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="142" parent="19" name="value">
+    <column id="114" parent="14" name="value">
       <Position>2</Position>
       <DataType>TEXT|0s</DataType>
     </column>
-    <column id="143" parent="19" name="isSynced">
+    <column id="115" parent="14" name="isSynced">
       <Position>3</Position>
       <DataType>INTEGER|0s</DataType>
       <NotNull>1</NotNull>
       <DefaultExpression>0</DefaultExpression>
     </column>
-    <column id="144" parent="19" name="hash">
+    <column id="116" parent="14" name="hash">
       <Position>4</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
       <DefaultExpression>&quot;&quot;</DefaultExpression>
     </column>
-    <column id="145" parent="19" name="utcDateCreated">
+    <column id="117" parent="14" name="utcDateCreated">
       <Position>5</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="146" parent="19" name="utcDateModified">
+    <column id="118" parent="14" name="utcDateModified">
       <Position>6</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
     </column>
-    <index id="147" parent="19" name="sqlite_autoindex_options_1">
+    <index id="119" parent="14" name="sqlite_autoindex_options_1">
       <NameSurrogate>1</NameSurrogate>
       <ColNames>name</ColNames>
+      <ColumnCollations></ColumnCollations>
       <Unique>1</Unique>
     </index>
-    <key id="148" parent="19">
+    <key id="120" parent="14">
       <ColNames>name</ColNames>
       <Primary>1</Primary>
       <UnderlyingIndexName>sqlite_autoindex_options_1</UnderlyingIndexName>
     </key>
-    <column id="149" parent="20" name="branchId">
+    <column id="121" parent="15" name="branchId">
       <Position>1</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="150" parent="20" name="notePath">
+    <column id="122" parent="15" name="notePath">
       <Position>2</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="151" parent="20" name="hash">
+    <column id="123" parent="15" name="hash">
       <Position>3</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
       <DefaultExpression>&quot;&quot;</DefaultExpression>
     </column>
-    <column id="152" parent="20" name="utcDateCreated">
+    <column id="124" parent="15" name="utcDateCreated">
       <Position>4</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="153" parent="20" name="isDeleted">
+    <column id="125" parent="15" name="isDeleted">
       <Position>5</Position>
       <DataType>INT|0s</DataType>
     </column>
-    <index id="154" parent="20" name="sqlite_autoindex_recent_notes_1">
+    <index id="126" parent="15" name="sqlite_autoindex_recent_notes_1">
       <NameSurrogate>1</NameSurrogate>
       <ColNames>branchId</ColNames>
+      <ColumnCollations></ColumnCollations>
       <Unique>1</Unique>
     </index>
-    <key id="155" parent="20">
+    <key id="127" parent="15">
       <ColNames>branchId</ColNames>
       <Primary>1</Primary>
       <UnderlyingIndexName>sqlite_autoindex_recent_notes_1</UnderlyingIndexName>
     </key>
-    <column id="156" parent="21" name="sourceId">
+    <column id="128" parent="16" name="sourceId">
       <Position>1</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="157" parent="21" name="utcDateCreated">
+    <column id="129" parent="16" name="utcDateCreated">
       <Position>2</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
     </column>
-    <index id="158" parent="21" name="sqlite_autoindex_source_ids_1">
+    <index id="130" parent="16" name="sqlite_autoindex_source_ids_1">
       <NameSurrogate>1</NameSurrogate>
       <ColNames>sourceId</ColNames>
+      <ColumnCollations></ColumnCollations>
       <Unique>1</Unique>
     </index>
-    <key id="159" parent="21">
+    <key id="131" parent="16">
       <ColNames>sourceId</ColNames>
       <Primary>1</Primary>
       <UnderlyingIndexName>sqlite_autoindex_source_ids_1</UnderlyingIndexName>
     </key>
-    <column id="160" parent="22" name="type">
+    <column id="132" parent="17" name="type">
       <Position>1</Position>
       <DataType>text|0s</DataType>
     </column>
-    <column id="161" parent="22" name="name">
+    <column id="133" parent="17" name="name">
       <Position>2</Position>
       <DataType>text|0s</DataType>
     </column>
-    <column id="162" parent="22" name="tbl_name">
+    <column id="134" parent="17" name="tbl_name">
       <Position>3</Position>
       <DataType>text|0s</DataType>
     </column>
-    <column id="163" parent="22" name="rootpage">
+    <column id="135" parent="17" name="rootpage">
       <Position>4</Position>
       <DataType>int|0s</DataType>
     </column>
-    <column id="164" parent="22" name="sql">
+    <column id="136" parent="17" name="sql">
       <Position>5</Position>
       <DataType>text|0s</DataType>
     </column>
-    <column id="165" parent="23" name="name">
+    <column id="137" parent="18" name="name">
       <Position>1</Position>
     </column>
-    <column id="166" parent="23" name="seq">
+    <column id="138" parent="18" name="seq">
       <Position>2</Position>
     </column>
-    <column id="167" parent="24" name="id">
+    <column id="139" parent="19" name="id">
       <Position>1</Position>
       <DataType>INTEGER|0s</DataType>
       <NotNull>1</NotNull>
       <SequenceIdentity>1</SequenceIdentity>
     </column>
-    <column id="168" parent="24" name="entityName">
+    <column id="140" parent="19" name="entityName">
       <Position>2</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="169" parent="24" name="entityId">
+    <column id="141" parent="19" name="entityId">
       <Position>3</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="170" parent="24" name="sourceId">
+    <column id="142" parent="19" name="sourceId">
       <Position>4</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="171" parent="24" name="utcSyncDate">
+    <column id="143" parent="19" name="utcSyncDate">
       <Position>5</Position>
       <DataType>TEXT|0s</DataType>
       <NotNull>1</NotNull>
     </column>
-    <index id="172" parent="24" name="IDX_sync_entityName_entityId">
+    <index id="144" parent="19" name="IDX_sync_entityName_entityId">
       <ColNames>entityName
 entityId</ColNames>
+      <ColumnCollations></ColumnCollations>
       <Unique>1</Unique>
     </index>
-    <index id="173" parent="24" name="IDX_sync_utcSyncDate">
+    <index id="145" parent="19" name="IDX_sync_utcSyncDate">
       <ColNames>utcSyncDate</ColNames>
+      <ColumnCollations></ColumnCollations>
     </index>
-    <key id="174" parent="24">
+    <key id="146" parent="19">
       <ColNames>id</ColNames>
       <Primary>1</Primary>
     </key>
diff --git a/bin/build-docker.sh b/bin/build-docker.sh
index 44bb545d9..1ab0b7f86 100755
--- a/bin/build-docker.sh
+++ b/bin/build-docker.sh
@@ -2,4 +2,4 @@
 
 VERSION=`jq -r ".version" package.json`
 
-sudo docker build -t zadam/trilium:latest -t zadam/trilium:$VERSION .
\ No newline at end of file
+sudo docker build -t zadam/trilium:$VERSION .
\ No newline at end of file
diff --git a/bin/push-docker-image.sh b/bin/push-docker-image.sh
index 83c0dc19c..1da48d2db 100755
--- a/bin/push-docker-image.sh
+++ b/bin/push-docker-image.sh
@@ -5,5 +5,8 @@ if [[ $# -eq 0 ]] ; then
     exit 1
 fi
 
-sudo docker push zadam/trilium:latest
-sudo docker push zadam/trilium:$1
\ No newline at end of file
+sudo docker push zadam/trilium:$1
+
+if [[ $1 != *"beta"* ]]; then
+  sudo docker push zadam/trilium:latest
+fi