release 0.44.1-beta

more compact note revisions widget
more compact note info widget
2025-10-26 15:56:29 +01:00 · 2020-09-05 23:43:06 +02:00 · 2020-09-05 23:35:24 +02:00 · 2020-09-05 22:49:30 +02:00 · 2020-09-05 22:45:26 +02:00 · 2020-09-05 21:51:00 +02:00
506 changed files with 38359 additions and 27170 deletions
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -0,0 +1,3 @@
+# These are supported funding model platforms
+
+github: [zadam]
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 .DS_Store
 node_modules/
 dist/
+src/public/app-dist/
 npm-debug.log
 yarn-error.log
 *.db
--- a/.idea/dataSources.xml
+++ b/.idea/dataSources.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
  <component name="DataSourceManagerImpl" format="xml" multifile-model="true">
-    <data-source source="LOCAL" name="document.db" uuid="a2c75661-f9e2-478f-a69f-6a9409e69997">
+    <data-source source="LOCAL" name="document.db" uuid="4e69c96a-8a2b-43f5-9b40-d1608f75f7a4">
      <driver-ref>sqlite.xerial</driver-ref>
      <synchronize>true</synchronize>
      <jdbc-driver>org.sqlite.JDBC</jdbc-driver>
-      <jdbc-url>jdbc:sqlite:$PROJECT_DIR$/../trilium-data/document.db</jdbc-url>
+      <jdbc-url>jdbc:sqlite:$USER_HOME$/trilium-data/document.db</jdbc-url>
    </data-source>
  </component>
 </project>
--- a/.idea/dataSources/a2c75661-f9e2-478f-a69f-6a9409e69997.xml
+++ b/.idea/dataSources/a2c75661-f9e2-478f-a69f-6a9409e69997.xml
@@ -1,662 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<dataSource name="document.db">
-  <database-model serializer="dbm" dbms="SQLITE" family-id="SQLITE" format-version="4.17">
-    <root id="1">
-      <ServerVersion>3.25.1</ServerVersion>
-    </root>
-    <schema id="2" parent="1" name="main">
-      <Current>1</Current>
-    </schema>
-    <collation id="3" parent="1" name="BINARY"/>
-    <collation id="4" parent="1" name="NOCASE"/>
-    <collation id="5" parent="1" name="RTRIM"/>
-    <table id="6" parent="2" name="api_tokens"/>
-    <table id="7" parent="2" name="attributes"/>
-    <table id="8" parent="2" name="branches"/>
-    <table id="9" parent="2" name="note_contents"/>
-    <table id="10" parent="2" name="note_revision_contents"/>
-    <table id="11" parent="2" name="note_revisions"/>
-    <table id="12" parent="2" name="notes"/>
-    <table id="13" parent="2" name="options"/>
-    <table id="14" parent="2" name="recent_notes"/>
-    <table id="15" parent="2" name="source_ids"/>
-    <table id="16" parent="2" name="sqlite_master">
-      <System>1</System>
-    </table>
-    <table id="17" parent="2" name="sqlite_sequence">
-      <System>1</System>
-    </table>
-    <table id="18" parent="2" name="sync"/>
-    <column id="19" parent="6" name="apiTokenId">
-      <Position>1</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="20" parent="6" name="token">
-      <Position>2</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="21" parent="6" name="utcDateCreated">
-      <Position>3</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="22" parent="6" name="isDeleted">
-      <Position>4</Position>
-      <DataType>INT|0s</DataType>
-      <NotNull>1</NotNull>
-      <DefaultExpression>0</DefaultExpression>
-    </column>
-    <column id="23" parent="6" name="hash">
-      <Position>5</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-      <DefaultExpression>&quot;&quot;</DefaultExpression>
-    </column>
-    <index id="24" parent="6" name="sqlite_autoindex_api_tokens_1">
-      <NameSurrogate>1</NameSurrogate>
-      <ColNames>apiTokenId</ColNames>
-      <Unique>1</Unique>
-    </index>
-    <key id="25" parent="6">
-      <ColNames>apiTokenId</ColNames>
-      <Primary>1</Primary>
-      <UnderlyingIndexName>sqlite_autoindex_api_tokens_1</UnderlyingIndexName>
-    </key>
-    <column id="26" parent="7" name="attributeId">
-      <Position>1</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="27" parent="7" name="noteId">
-      <Position>2</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="28" parent="7" name="type">
-      <Position>3</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="29" parent="7" name="name">
-      <Position>4</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="30" parent="7" name="value">
-      <Position>5</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-      <DefaultExpression>&apos;&apos;</DefaultExpression>
-    </column>
-    <column id="31" parent="7" name="position">
-      <Position>6</Position>
-      <DataType>INT|0s</DataType>
-      <NotNull>1</NotNull>
-      <DefaultExpression>0</DefaultExpression>
-    </column>
-    <column id="32" parent="7" name="utcDateCreated">
-      <Position>7</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="33" parent="7" name="utcDateModified">
-      <Position>8</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="34" parent="7" name="isDeleted">
-      <Position>9</Position>
-      <DataType>INT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="35" parent="7" name="deleteId">
-      <Position>10</Position>
-      <DataType>TEXT|0s</DataType>
-      <DefaultExpression>NULL</DefaultExpression>
-    </column>
-    <column id="36" parent="7" name="hash">
-      <Position>11</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-      <DefaultExpression>&quot;&quot;</DefaultExpression>
-    </column>
-    <column id="37" parent="7" name="isInheritable">
-      <Position>12</Position>
-      <DataType>int|0s</DataType>
-      <DefaultExpression>0</DefaultExpression>
-    </column>
-    <index id="38" parent="7" name="sqlite_autoindex_attributes_1">
-      <NameSurrogate>1</NameSurrogate>
-      <ColNames>attributeId</ColNames>
-      <Unique>1</Unique>
-    </index>
-    <index id="39" parent="7" name="IDX_attributes_noteId_index">
-      <ColNames>noteId</ColNames>
-    </index>
-    <index id="40" parent="7" name="IDX_attributes_name_value">
-      <ColNames>name
-value</ColNames>
-    </index>
-    <index id="41" parent="7" name="IDX_attributes_value_index">
-      <ColNames>value</ColNames>
-    </index>
-    <key id="42" parent="7">
-      <ColNames>attributeId</ColNames>
-      <Primary>1</Primary>
-      <UnderlyingIndexName>sqlite_autoindex_attributes_1</UnderlyingIndexName>
-    </key>
-    <column id="43" parent="8" name="branchId">
-      <Position>1</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="44" parent="8" name="noteId">
-      <Position>2</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="45" parent="8" name="parentNoteId">
-      <Position>3</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="46" parent="8" name="notePosition">
-      <Position>4</Position>
-      <DataType>INTEGER|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="47" parent="8" name="prefix">
-      <Position>5</Position>
-      <DataType>TEXT|0s</DataType>
-    </column>
-    <column id="48" parent="8" name="isExpanded">
-      <Position>6</Position>
-      <DataType>INTEGER|0s</DataType>
-      <NotNull>1</NotNull>
-      <DefaultExpression>0</DefaultExpression>
-    </column>
-    <column id="49" parent="8" name="isDeleted">
-      <Position>7</Position>
-      <DataType>INTEGER|0s</DataType>
-      <NotNull>1</NotNull>
-      <DefaultExpression>0</DefaultExpression>
-    </column>
-    <column id="50" parent="8" name="deleteId">
-      <Position>8</Position>
-      <DataType>TEXT|0s</DataType>
-      <DefaultExpression>NULL</DefaultExpression>
-    </column>
-    <column id="51" parent="8" name="utcDateModified">
-      <Position>9</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="52" parent="8" name="utcDateCreated">
-      <Position>10</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="53" parent="8" name="hash">
-      <Position>11</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-      <DefaultExpression>&quot;&quot;</DefaultExpression>
-    </column>
-    <index id="54" parent="8" name="sqlite_autoindex_branches_1">
-      <NameSurrogate>1</NameSurrogate>
-      <ColNames>branchId</ColNames>
-      <Unique>1</Unique>
-    </index>
-    <index id="55" parent="8" name="IDX_branches_noteId_parentNoteId">
-      <ColNames>noteId
-parentNoteId</ColNames>
-    </index>
-    <index id="56" parent="8" name="IDX_branches_parentNoteId">
-      <ColNames>parentNoteId</ColNames>
-    </index>
-    <key id="57" parent="8">
-      <ColNames>branchId</ColNames>
-      <Primary>1</Primary>
-      <UnderlyingIndexName>sqlite_autoindex_branches_1</UnderlyingIndexName>
-    </key>
-    <column id="58" parent="9" name="noteId">
-      <Position>1</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="59" parent="9" name="content">
-      <Position>2</Position>
-      <DataType>TEXT|0s</DataType>
-      <DefaultExpression>NULL</DefaultExpression>
-    </column>
-    <column id="60" parent="9" name="hash">
-      <Position>3</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-      <DefaultExpression>&quot;&quot;</DefaultExpression>
-    </column>
-    <column id="61" parent="9" name="utcDateModified">
-      <Position>4</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <index id="62" parent="9" name="sqlite_autoindex_note_contents_1">
-      <NameSurrogate>1</NameSurrogate>
-      <ColNames>noteId</ColNames>
-      <Unique>1</Unique>
-    </index>
-    <key id="63" parent="9">
-      <ColNames>noteId</ColNames>
-      <Primary>1</Primary>
-      <UnderlyingIndexName>sqlite_autoindex_note_contents_1</UnderlyingIndexName>
-    </key>
-    <column id="64" parent="10" name="noteRevisionId">
-      <Position>1</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="65" parent="10" name="content">
-      <Position>2</Position>
-      <DataType>TEXT|0s</DataType>
-    </column>
-    <column id="66" parent="10" name="hash">
-      <Position>3</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-      <DefaultExpression>&apos;&apos;</DefaultExpression>
-    </column>
-    <column id="67" parent="10" name="utcDateModified">
-      <Position>4</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <index id="68" parent="10" name="sqlite_autoindex_note_revision_contents_1">
-      <NameSurrogate>1</NameSurrogate>
-      <ColNames>noteRevisionId</ColNames>
-      <Unique>1</Unique>
-    </index>
-    <key id="69" parent="10">
-      <ColNames>noteRevisionId</ColNames>
-      <Primary>1</Primary>
-      <UnderlyingIndexName>sqlite_autoindex_note_revision_contents_1</UnderlyingIndexName>
-    </key>
-    <column id="70" parent="11" name="noteRevisionId">
-      <Position>1</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="71" parent="11" name="noteId">
-      <Position>2</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="72" parent="11" name="title">
-      <Position>3</Position>
-      <DataType>TEXT|0s</DataType>
-    </column>
-    <column id="73" parent="11" name="contentLength">
-      <Position>4</Position>
-      <DataType>INT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="74" parent="11" name="isErased">
-      <Position>5</Position>
-      <DataType>INT|0s</DataType>
-      <NotNull>1</NotNull>
-      <DefaultExpression>0</DefaultExpression>
-    </column>
-    <column id="75" parent="11" name="isProtected">
-      <Position>6</Position>
-      <DataType>INT|0s</DataType>
-      <NotNull>1</NotNull>
-      <DefaultExpression>0</DefaultExpression>
-    </column>
-    <column id="76" parent="11" name="utcDateLastEdited">
-      <Position>7</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="77" parent="11" name="utcDateCreated">
-      <Position>8</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="78" parent="11" name="utcDateModified">
-      <Position>9</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="79" parent="11" name="dateLastEdited">
-      <Position>10</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="80" parent="11" name="dateCreated">
-      <Position>11</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="81" parent="11" name="type">
-      <Position>12</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-      <DefaultExpression>&apos;&apos;</DefaultExpression>
-    </column>
-    <column id="82" parent="11" name="mime">
-      <Position>13</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-      <DefaultExpression>&apos;&apos;</DefaultExpression>
-    </column>
-    <column id="83" parent="11" name="hash">
-      <Position>14</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-      <DefaultExpression>&apos;&apos;</DefaultExpression>
-    </column>
-    <index id="84" parent="11" name="sqlite_autoindex_note_revisions_1">
-      <NameSurrogate>1</NameSurrogate>
-      <ColNames>noteRevisionId</ColNames>
-      <Unique>1</Unique>
-    </index>
-    <index id="85" parent="11" name="IDX_note_revisions_noteId">
-      <ColNames>noteId</ColNames>
-    </index>
-    <index id="86" parent="11" name="IDX_note_revisions_utcDateLastEdited">
-      <ColNames>utcDateLastEdited</ColNames>
-    </index>
-    <index id="87" parent="11" name="IDX_note_revisions_utcDateCreated">
-      <ColNames>utcDateCreated</ColNames>
-    </index>
-    <index id="88" parent="11" name="IDX_note_revisions_dateLastEdited">
-      <ColNames>dateLastEdited</ColNames>
-    </index>
-    <index id="89" parent="11" name="IDX_note_revisions_dateCreated">
-      <ColNames>dateCreated</ColNames>
-    </index>
-    <key id="90" parent="11">
-      <ColNames>noteRevisionId</ColNames>
-      <Primary>1</Primary>
-      <UnderlyingIndexName>sqlite_autoindex_note_revisions_1</UnderlyingIndexName>
-    </key>
-    <column id="91" parent="12" name="noteId">
-      <Position>1</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="92" parent="12" name="title">
-      <Position>2</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-      <DefaultExpression>&quot;note&quot;</DefaultExpression>
-    </column>
-    <column id="93" parent="12" name="contentLength">
-      <Position>3</Position>
-      <DataType>INT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="94" parent="12" name="isProtected">
-      <Position>4</Position>
-      <DataType>INT|0s</DataType>
-      <NotNull>1</NotNull>
-      <DefaultExpression>0</DefaultExpression>
-    </column>
-    <column id="95" parent="12" name="type">
-      <Position>5</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-      <DefaultExpression>&apos;text&apos;</DefaultExpression>
-    </column>
-    <column id="96" parent="12" name="mime">
-      <Position>6</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-      <DefaultExpression>&apos;text/html&apos;</DefaultExpression>
-    </column>
-    <column id="97" parent="12" name="hash">
-      <Position>7</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-      <DefaultExpression>&quot;&quot;</DefaultExpression>
-    </column>
-    <column id="98" parent="12" name="isDeleted">
-      <Position>8</Position>
-      <DataType>INT|0s</DataType>
-      <NotNull>1</NotNull>
-      <DefaultExpression>0</DefaultExpression>
-    </column>
-    <column id="99" parent="12" name="deleteId">
-      <Position>9</Position>
-      <DataType>TEXT|0s</DataType>
-      <DefaultExpression>NULL</DefaultExpression>
-    </column>
-    <column id="100" parent="12" name="isErased">
-      <Position>10</Position>
-      <DataType>INT|0s</DataType>
-      <NotNull>1</NotNull>
-      <DefaultExpression>0</DefaultExpression>
-    </column>
-    <column id="101" parent="12" name="dateCreated">
-      <Position>11</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="102" parent="12" name="dateModified">
-      <Position>12</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="103" parent="12" name="utcDateCreated">
-      <Position>13</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="104" parent="12" name="utcDateModified">
-      <Position>14</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <index id="105" parent="12" name="sqlite_autoindex_notes_1">
-      <NameSurrogate>1</NameSurrogate>
-      <ColNames>noteId</ColNames>
-      <Unique>1</Unique>
-    </index>
-    <index id="106" parent="12" name="IDX_notes_title">
-      <ColNames>title</ColNames>
-    </index>
-    <index id="107" parent="12" name="IDX_notes_type">
-      <ColNames>type</ColNames>
-    </index>
-    <index id="108" parent="12" name="IDX_notes_isDeleted">
-      <ColNames>isDeleted</ColNames>
-    </index>
-    <index id="109" parent="12" name="IDX_notes_dateCreated">
-      <ColNames>dateCreated</ColNames>
-    </index>
-    <index id="110" parent="12" name="IDX_notes_dateModified">
-      <ColNames>dateModified</ColNames>
-    </index>
-    <index id="111" parent="12" name="IDX_notes_utcDateCreated">
-      <ColNames>utcDateCreated</ColNames>
-    </index>
-    <index id="112" parent="12" name="IDX_notes_utcDateModified">
-      <ColNames>utcDateModified</ColNames>
-    </index>
-    <key id="113" parent="12">
-      <ColNames>noteId</ColNames>
-      <Primary>1</Primary>
-      <UnderlyingIndexName>sqlite_autoindex_notes_1</UnderlyingIndexName>
-    </key>
-    <column id="114" parent="13" name="name">
-      <Position>1</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="115" parent="13" name="value">
-      <Position>2</Position>
-      <DataType>TEXT|0s</DataType>
-    </column>
-    <column id="116" parent="13" name="isSynced">
-      <Position>3</Position>
-      <DataType>INTEGER|0s</DataType>
-      <NotNull>1</NotNull>
-      <DefaultExpression>0</DefaultExpression>
-    </column>
-    <column id="117" parent="13" name="hash">
-      <Position>4</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-      <DefaultExpression>&quot;&quot;</DefaultExpression>
-    </column>
-    <column id="118" parent="13" name="utcDateCreated">
-      <Position>5</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="119" parent="13" name="utcDateModified">
-      <Position>6</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <index id="120" parent="13" name="sqlite_autoindex_options_1">
-      <NameSurrogate>1</NameSurrogate>
-      <ColNames>name</ColNames>
-      <Unique>1</Unique>
-    </index>
-    <key id="121" parent="13">
-      <ColNames>name</ColNames>
-      <Primary>1</Primary>
-      <UnderlyingIndexName>sqlite_autoindex_options_1</UnderlyingIndexName>
-    </key>
-    <column id="122" parent="14" name="noteId">
-      <Position>1</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="123" parent="14" name="notePath">
-      <Position>2</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="124" parent="14" name="hash">
-      <Position>3</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-      <DefaultExpression>&quot;&quot;</DefaultExpression>
-    </column>
-    <column id="125" parent="14" name="utcDateCreated">
-      <Position>4</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="126" parent="14" name="isDeleted">
-      <Position>5</Position>
-      <DataType>INT|0s</DataType>
-    </column>
-    <index id="127" parent="14" name="sqlite_autoindex_recent_notes_1">
-      <NameSurrogate>1</NameSurrogate>
-      <ColNames>noteId</ColNames>
-      <Unique>1</Unique>
-    </index>
-    <key id="128" parent="14">
-      <ColNames>noteId</ColNames>
-      <Primary>1</Primary>
-      <UnderlyingIndexName>sqlite_autoindex_recent_notes_1</UnderlyingIndexName>
-    </key>
-    <column id="129" parent="15" name="sourceId">
-      <Position>1</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="130" parent="15" name="utcDateCreated">
-      <Position>2</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <index id="131" parent="15" name="sqlite_autoindex_source_ids_1">
-      <NameSurrogate>1</NameSurrogate>
-      <ColNames>sourceId</ColNames>
-      <Unique>1</Unique>
-    </index>
-    <index id="132" parent="15" name="IDX_source_ids_utcDateCreated">
-      <ColNames>utcDateCreated</ColNames>
-    </index>
-    <key id="133" parent="15">
-      <ColNames>sourceId</ColNames>
-      <Primary>1</Primary>
-      <UnderlyingIndexName>sqlite_autoindex_source_ids_1</UnderlyingIndexName>
-    </key>
-    <column id="134" parent="16" name="type">
-      <Position>1</Position>
-      <DataType>text|0s</DataType>
-    </column>
-    <column id="135" parent="16" name="name">
-      <Position>2</Position>
-      <DataType>text|0s</DataType>
-    </column>
-    <column id="136" parent="16" name="tbl_name">
-      <Position>3</Position>
-      <DataType>text|0s</DataType>
-    </column>
-    <column id="137" parent="16" name="rootpage">
-      <Position>4</Position>
-      <DataType>int|0s</DataType>
-    </column>
-    <column id="138" parent="16" name="sql">
-      <Position>5</Position>
-      <DataType>text|0s</DataType>
-    </column>
-    <column id="139" parent="17" name="name">
-      <Position>1</Position>
-    </column>
-    <column id="140" parent="17" name="seq">
-      <Position>2</Position>
-    </column>
-    <column id="141" parent="18" name="id">
-      <Position>1</Position>
-      <DataType>INTEGER|0s</DataType>
-      <NotNull>1</NotNull>
-      <SequenceIdentity>1</SequenceIdentity>
-    </column>
-    <column id="142" parent="18" name="entityName">
-      <Position>2</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="143" parent="18" name="entityId">
-      <Position>3</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="144" parent="18" name="sourceId">
-      <Position>4</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="145" parent="18" name="isSynced">
-      <Position>5</Position>
-      <DataType>INTEGER|0s</DataType>
-      <NotNull>1</NotNull>
-      <DefaultExpression>0</DefaultExpression>
-    </column>
-    <column id="146" parent="18" name="utcSyncDate">
-      <Position>6</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <index id="147" parent="18" name="IDX_sync_entityName_entityId">
-      <ColNames>entityName
-entityId</ColNames>
-      <Unique>1</Unique>
-    </index>
-    <index id="148" parent="18" name="IDX_sync_utcSyncDate">
-      <ColNames>utcSyncDate</ColNames>
-    </index>
-    <key id="149" parent="18">
-      <ColNames>id</ColNames>
-      <Primary>1</Primary>
-    </key>
-  </database-model>
-</dataSource>
--- a/.idea/dataSources/a2c75661-f9e2-478f-a69f-6a9409e69997/storage_v2/_src_/schema/main.uQUzAA.meta
+++ b/.idea/dataSources/a2c75661-f9e2-478f-a69f-6a9409e69997/storage_v2/_src_/schema/main.uQUzAA.meta
@@ -1,2 +0,0 @@
-#n:main
-!<md> [0, 0, null, null, -2147483648, -2147483648]
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -1,6 +1,7 @@
 <component name="InspectionProjectProfileManager">
  <profile version="1.0">
    <option name="myName" value="Project Default" />
+    <inspection_tool class="JSUnfilteredForInLoop" enabled="false" level="WARNING" enabled_by_default="false" />
    <inspection_tool class="SpellCheckingInspection" enabled="false" level="TYPO" enabled_by_default="false">
      <option name="processCode" value="true" />
      <option name="processLiterals" value="true" />
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -2,5 +2,6 @@
 <project version="4">
  <component name="VcsDirectoryMappings">
    <mapping directory="" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/../.." vcs="Git" />
  </component>
 </project>
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -0,0 +1,18 @@
+{
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "type": "node",
+            "request": "launch",
+            "name": "start-server",
+            "skipFiles": [
+                "<node_internals>/**"
+            ],
+            "env": {
+                "TRILIUM_ENV": "dev"
+            },
+            "outputCapture": "std",
+            "program": "${workspaceFolder}/src/www"
+        }
+    ]
+}
--- a/2
+++ b/2
@@ -1,4 +1,4 @@
-FROM node:12.14.0-alpine
+FROM node:12.16.3-alpine

 # Create app directory
 WORKDIR /usr/src/app
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@ Trilium Notes is a hierarchical note taking application with focus on building l
 ## Features

 * Notes can be arranged into arbitrarily deep tree. Single note can be placed into multiple places in the tree (see [cloning](https://github.com/zadam/trilium/wiki/Cloning-notes))
-* Rich WYSIWYG note editing including e.g. tables and images with markdown [autoformat](https://github.com/zadam/trilium/wiki/Text-editor#autoformat)
+* Rich WYSIWYG note editing including e.g. tables and images with markdown [autoformat](https://github.com/zadam/trilium/wiki/Text-notes#autoformat)
 * Support for editing [notes with source code](https://github.com/zadam/trilium/wiki/Code-notes), including syntax highlighting
 * Fast and easy [navigation between notes](https://github.com/zadam/trilium/wiki/Note-navigation), full text search and [note hoisting](https://github.com/zadam/trilium/wiki/Note-hoisting)
 * Seamless [note versioning](https://github.com/zadam/trilium/wiki/Note-revisions)
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -0,0 +1,13 @@
+# Security Policy
+
+## Supported Versions
+
+In the (still active) 0.X phase of the project only the latest stable minor release is getting bugfixes (including security ones).
+
+So e.g. if the latest stable version is 0.42.3 and the latest beta version is 0.43.0-beta, then 0.42 line will still get security fixes but older versions (like 0.41.X) won't get any fixes.
+
+Description above is a general rule and may be altered on case by case basis.
+
+## Reporting a Vulnerability
+
+You can report low severity vulnerabilities as GitHub issues, more severe vulnerabilities should be reported to the email zadam.apps@gmail.com
--- a/bin/better-sqlite3/linux-desktop-better_sqlite3.node
+++ b/bin/better-sqlite3/linux-desktop-better_sqlite3.node
--- a/bin/better-sqlite3/linux-server-better_sqlite3.node
+++ b/bin/better-sqlite3/linux-server-better_sqlite3.node
--- a/bin/better-sqlite3/mac-better_sqlite3.node
+++ b/bin/better-sqlite3/mac-better_sqlite3.node
--- a/bin/better-sqlite3/win-better_sqlite3.node
+++ b/bin/better-sqlite3/win-better_sqlite3.node
--- a/bin/build-linux-x64.sh
+++ b/bin/build-linux-x64.sh
@@ -7,15 +7,11 @@ then
    ./bin/copy-trilium.sh $SRC_DIR
 fi

+rm -r $SRC_DIR/src/public/app-dist/*.mobile.*
+
 echo "Copying required linux-x64 binaries"

-rm -r $SRC_DIR/node_modules/sqlite3/lib/binding/*
-rm -r $SRC_DIR/node_modules/pngquant-bin/vendor/*
-rm -r $SRC_DIR/node_modules/@felixrieseberg/spellchecker/build/Release/*
-
-cp -r bin/deps/linux-x64/sqlite/* $SRC_DIR/node_modules/sqlite3/lib/binding/
-cp bin/deps/linux-x64/image/pngquant $SRC_DIR/node_modules/pngquant-bin/vendor/
-cp bin/deps/linux-x64/spellchecker/* $SRC_DIR/node_modules/@felixrieseberg/spellchecker/build/Release/
+cp -r bin/better-sqlite3/linux-desktop-better_sqlite3.node $SRC_DIR/node_modules/better-sqlite3/build/Release/better_sqlite3.node

 ./node_modules/.bin/electron-packager $SRC_DIR --asar --out=dist --executable-name=trilium --platform=linux --arch=x64 --overwrite

@@ -29,6 +25,9 @@ cp images/app-icons/png/128x128.png $BUILD_DIR/icon.png
 # removing software WebGL binaries because they are pretty huge and not necessary
 rm -r $BUILD_DIR/swiftshader

+cp bin/tpl/portable-trilium.sh $BUILD_DIR/
+chmod 755 $BUILD_DIR/portable-trilium.sh
+
 echo "Packaging linux x64 electron distribution..."
 VERSION=`jq -r ".version" package.json`

@@ -38,4 +37,4 @@ tar cJf trilium-linux-x64-${VERSION}.tar.xz trilium-linux-x64

 cd ..

-bin/build-debian.sh
+bin/build-debian.sh
--- a/bin/build-mac-x64.sh
+++ b/bin/build-mac-x64.sh
@@ -9,19 +9,9 @@ fi

 echo "Copying required mac binaries"

-rm -r $SRC_DIR/node_modules/sqlite3/lib/binding/*
-rm -r $SRC_DIR/node_modules/mozjpeg/vendor/*
-rm -r $SRC_DIR/node_modules/pngquant-bin/vendor/*
-rm -r $SRC_DIR/node_modules/giflossy/vendor/*
-rm -r $SRC_DIR/node_modules/@felixrieseberg/spellchecker/build/Release/*
-rm -r $SRC_DIR/node_modules/keyboard-layout/build/Release/*
+cp -r bin/better-sqlite3/mac-better_sqlite3.node $SRC_DIR/node_modules/better-sqlite3/build/Release/better_sqlite3.node

-cp -r bin/deps/mac-x64/sqlite/* $SRC_DIR/node_modules/sqlite3/lib/binding/
-cp bin/deps/mac-x64/image/cjpeg $SRC_DIR/node_modules/mozjpeg/vendor/
-cp bin/deps/mac-x64/image/pngquant $SRC_DIR/node_modules/pngquant-bin/vendor/
-cp bin/deps/mac-x64/image/gifsicle $SRC_DIR/node_modules/giflossy/vendor/
-cp bin/deps/mac-x64/spellchecker/* $SRC_DIR/node_modules/@felixrieseberg/spellchecker/build/Release/
-cp bin/deps/mac-x64/keyboard-layout-manager.node $SRC_DIR/node_modules/keyboard-layout/build/Release/
+rm -r $SRC_DIR/src/public/app-dist/*.mobile.*

 ./node_modules/.bin/electron-packager $SRC_DIR --asar --out=dist --executable-name=trilium --platform=darwin --arch=x64 --overwrite --icon=images/app-icons/mac/icon.icns

--- a/bin/build-server.sh
+++ b/bin/build-server.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash

 PKG_DIR=dist/trilium-linux-x64-server
-NODE_VERSION=12.14.0
+NODE_VERSION=12.18.3

 if [ "$1" != "DONTCOPY" ]
 then
@@ -16,11 +16,12 @@ cd ..

 mv dist/node-v${NODE_VERSION}-linux-x64 $PKG_DIR/node

+rm -r $PKG_DIR/node/lib/node_modules/npm
+rm -r $PKG_DIR/node/include/node
+
 rm -r $PKG_DIR/node_modules/electron*

-rm -r $PKG_DIR/node_modules/sqlite3/lib/binding/*
-
-cp -r ./bin/deps/linux-x64/sqlite/node* $PKG_DIR/node_modules/sqlite3/lib/binding/
+cp -r bin/better-sqlite3/linux-server-better_sqlite3.node $PKG_DIR/node_modules/better-sqlite3/build/Release/better_sqlite3.node

 printf "#!/bin/sh\n./node/bin/node src/www" > $PKG_DIR/trilium.sh
 chmod 755 $PKG_DIR/trilium.sh
--- a/bin/build-win-x64.sh
+++ b/bin/build-win-x64.sh
@@ -9,20 +9,9 @@ fi

 echo "Copying required windows binaries"

-rm -r $SRC_DIR/node_modules/sqlite3/lib/binding/*
-rm -r $SRC_DIR/node_modules/mozjpeg/vendor/*
-rm -r $SRC_DIR/node_modules/pngquant-bin/vendor/*
-rm -r $SRC_DIR/node_modules/giflossy/vendor/*
-rm -r $SRC_DIR/node_modules/@felixrieseberg/spellchecker/build/Release/*
-rm -r $SRC_DIR/node_modules/keyboard-layout/build/Release/*
-rm -r $SRC_DIR/node_modules/cld/build/Release/*
+cp -r bin/better-sqlite3/win-better_sqlite3.node $SRC_DIR/node_modules/better-sqlite3/build/Release/better_sqlite3.node

-cp -r bin/deps/win-x64/sqlite/* $SRC_DIR/node_modules/sqlite3/lib/binding/
-cp bin/deps/win-x64/image/cjpeg.exe $SRC_DIR/node_modules/mozjpeg/vendor/
-cp bin/deps/win-x64/image/pngquant.exe $SRC_DIR/node_modules/pngquant-bin/vendor/
-cp bin/deps/win-x64/image/gifsicle.exe $SRC_DIR/node_modules/giflossy/vendor/
-cp bin/deps/win-x64/spellchecker/* $SRC_DIR/node_modules/@felixrieseberg/spellchecker/build/Release/
-cp bin/deps/win-x64/keyboard-layout-manager.node $SRC_DIR/node_modules/keyboard-layout/build/Release/
+rm -r $SRC_DIR/src/public/app-dist/*.mobile.*

 ./node_modules/.bin/electron-packager $SRC_DIR --asar --out=dist --executable-name=trilium --platform=win32  --arch=x64 --overwrite --icon=images/app-icons/win/icon.ico

@@ -34,6 +23,8 @@ mv "./dist/Trilium Notes-win32-x64" $BUILD_DIR
 # removing software WebGL binaries because they are pretty huge and not necessary
 rm -r $BUILD_DIR/swiftshader

+cp bin/tpl/portable-trilium.bat $BUILD_DIR/
+
 echo "Zipping windows x64 electron distribution..."
 VERSION=`jq -r ".version" package.json`

--- a/bin/copy-trilium.sh
+++ b/bin/copy-trilium.sh
@@ -5,6 +5,8 @@ if [[ $# -eq 0 ]] ; then
    exit 1
 fi

+npm run webpack
+
 DIR=$1

 rm -rf $DIR
@@ -22,11 +24,27 @@ cp -r README.md $DIR/
 cp -r LICENSE $DIR/
 cp -r config-sample.ini $DIR/
 cp -r electron.js $DIR/
+cp webpack-* $DIR/

 # run in subshell (so we return to original dir)
 (cd $DIR && npm install --only=prod)

-rm -r $DIR/node_modules/cld/deps
+# cleanup of useless files in dependencies
+rm -r $DIR/node_modules/image-q/demo
+rm -r $DIR/node_modules/better-sqlite3/deps/sqlite3.tar.gz
+rm -r $DIR/node_modules/@jimp/plugin-print/fonts
+rm -r $DIR/node_modules/jimp/browser
+rm -r $DIR/node_modules/jimp/fonts
+
+# delete all tests (there are often large images as test file for jimp etc.)
+find $DIR/node_modules -name test -exec rm -rf {} \;
+find $DIR/node_modules -name docs -exec rm -rf {} \;
+find $DIR/node_modules -name demo -exec rm -rf {} \;

 find $DIR/libraries -name "*.map" -type f -delete
-find $DIR/libraries -name "hunspell.lib" -type f -delete
+
+rm -r $DIR/src/public/app
+
+sed -i -e 's/app\/desktop.js/app-dist\/desktop.js/g' $DIR/src/views/desktop.ejs
+sed -i -e 's/app\/mobile.js/app-dist\/mobile.js/g' $DIR/src/views/mobile.ejs
+sed -i -e 's/app\/setup.js/app-dist\/setup.js/g' $DIR/src/views/setup.ejs
--- a/bin/deps/linux-x64/image/pngquant
+++ b/bin/deps/linux-x64/image/pngquant
--- a/bin/deps/linux-x64/spellchecker/hunspell.a
+++ b/bin/deps/linux-x64/spellchecker/hunspell.a
--- a/bin/deps/linux-x64/spellchecker/spellchecker.node
+++ b/bin/deps/linux-x64/spellchecker/spellchecker.node
--- a/bin/deps/linux-x64/sqlite/electron-v6.0-linux-x64/node_sqlite3.node
+++ b/bin/deps/linux-x64/sqlite/electron-v6.0-linux-x64/node_sqlite3.node
--- a/bin/deps/linux-x64/sqlite/node-v72-linux-x64/node_sqlite3.node
+++ b/bin/deps/linux-x64/sqlite/node-v72-linux-x64/node_sqlite3.node
--- a/bin/deps/mac-x64/image/cjpeg
+++ b/bin/deps/mac-x64/image/cjpeg
--- a/bin/deps/mac-x64/image/gifsicle
+++ b/bin/deps/mac-x64/image/gifsicle
--- a/bin/deps/mac-x64/image/pngquant
+++ b/bin/deps/mac-x64/image/pngquant
--- a/bin/deps/mac-x64/keyboard-layout-manager.node
+++ b/bin/deps/mac-x64/keyboard-layout-manager.node
--- a/bin/deps/mac-x64/spellchecker/hunspell.a
+++ b/bin/deps/mac-x64/spellchecker/hunspell.a
--- a/bin/deps/mac-x64/spellchecker/spellchecker.node
+++ b/bin/deps/mac-x64/spellchecker/spellchecker.node
--- a/bin/deps/mac-x64/sqlite/electron-v6.0-darwin-x64/node_sqlite3.node
+++ b/bin/deps/mac-x64/sqlite/electron-v6.0-darwin-x64/node_sqlite3.node
--- a/bin/deps/win-x64/image/cjpeg.exe
+++ b/bin/deps/win-x64/image/cjpeg.exe
--- a/bin/deps/win-x64/image/gifsicle.exe
+++ b/bin/deps/win-x64/image/gifsicle.exe
--- a/bin/deps/win-x64/image/pngquant.exe
+++ b/bin/deps/win-x64/image/pngquant.exe
--- a/bin/deps/win-x64/keyboard-layout-manager.node
+++ b/bin/deps/win-x64/keyboard-layout-manager.node
--- a/bin/deps/win-x64/spellchecker/hunspell.lib
+++ b/bin/deps/win-x64/spellchecker/hunspell.lib
--- a/bin/deps/win-x64/spellchecker/spellchecker.lib
+++ b/bin/deps/win-x64/spellchecker/spellchecker.lib
--- a/bin/deps/win-x64/spellchecker/spellchecker.node
+++ b/bin/deps/win-x64/spellchecker/spellchecker.node
--- a/bin/deps/win-x64/sqlite/electron-v6.0-win32-x64/node_sqlite3.node
+++ b/bin/deps/win-x64/sqlite/electron-v6.0-win32-x64/node_sqlite3.node
--- a/bin/generate-cert.sh
+++ b/bin/generate-cert.sh
@@ -12,5 +12,4 @@ fi
 mkdir -p "$DIR"
 cd "$DIR"

-openssl req -x509 -newkey rsa:2048 -keyout key.pem -out cert.pem -days 2000 -nodes
-
+openssl req -newkey rsa:4096 -x509 -sha256 -days 3650 -nodes -out cert.crt -keyout key.key
--- a/bin/tpl/portable-trilium.bat
+++ b/bin/tpl/portable-trilium.bat
@@ -0,0 +1,4 @@
+SET DIR=%~dp0
+SET TRILIUM_DATA_DIR=%DIR%\trilium-data
+cd %DIR%
+start trilium.exe
--- a/bin/tpl/portable-trilium.sh
+++ b/bin/tpl/portable-trilium.sh
@@ -0,0 +1,7 @@
+#!/usr/bin/env sh
+
+DIR=`dirname "$0"`
+export TRILIUM_DATA_DIR="$DIR/trilium-data"
+
+"$DIR/trilium"
+
--- a/config-sample.ini
+++ b/config-sample.ini
@@ -2,13 +2,16 @@
 # Instance name can be used to distinguish between different instances
 instanceName=

+# set to true to allow using Trilium without authentication (makes sense for server build only, desktop build doesn't need password)
+noAuthentication=false
+
 # Disable automatically generating desktop icon
 # noDesktopIcon=true

 [Network]
 # host setting is relevant only for web deployments - set the host on which the server will listen
 # host=0.0.0.0
-# port setting is relevant only for web deployments, desktop builds run on random free port
+# port setting is relevant only for web deployments, desktop builds run on a fixed port (changeable with TRILIUM_PORT environment variable)
 port=8080
 # true for TLS/SSL/HTTPS (secure), false for HTTP (unsecure).
 https=false
--- a/db/demo.tar
+++ b/db/demo.tar
--- a/db/demo.zip
+++ b/db/demo.zip
--- a/db/migrations/0104__fill_sync_rows_for_options.js
+++ b/db/migrations/0104__fill_sync_rows_for_options.js
@@ -1,4 +1,4 @@
-const syncTableService = require('../../src/services/sync_table');
+const syncTableService = require('../../src/services/entity_changes.js');

 // options has not been filled so far which caused problems with clean-slate sync.
-module.exports = async () => await syncTableService.fillAllSyncRows();
+module.exports = async () => await syncTableService.fillAllSyncRows();
--- a/db/migrations/0132__fill_sync.js
+++ b/db/migrations/0132__fill_sync.js
@@ -1,5 +1,5 @@
-const syncTableService = require('../../src/services/sync_table');
+const syncTableService = require('../../src/services/entity_changes.js');

 module.exports = async () => {
    await syncTableService.fillAllSyncRows();
-};
+};
--- a/db/migrations/0159__fix_isSynced_in_sync_rows.sql
+++ b/db/migrations/0159__fix_isSynced_in_sync_rows.sql
@@ -0,0 +1,4 @@
+UPDATE sync SET isSynced = 1 WHERE entityName != 'options' OR (
+        entityName = 'options'
+        AND 1 = (SELECT isSynced FROM options WHERE name = sync.entityId)
+    )
--- a/db/migrations/0160__migrate_attr_definitions.sql
+++ b/db/migrations/0160__migrate_attr_definitions.sql
@@ -0,0 +1,2 @@
+UPDATE attributes SET type = 'label', name = 'label:' || name WHERE type = 'label-definition';
+UPDATE attributes SET type = 'label', name = 'relation:' || name WHERE type = 'relation-definition';
--- a/db/migrations/0161__attr_def_short.js
+++ b/db/migrations/0161__attr_def_short.js
@@ -0,0 +1,79 @@
+const sql = require('../../src/services/sql');
+
+module.exports = () => {
+    for (const attr of sql.getRows("SELECT * FROM attributes WHERE name LIKE 'label:%'")) {
+        let obj;
+
+        try {
+            obj = JSON.parse(attr.value);
+        }
+        catch (e) {
+            console.log(`Parsing attribute definition "${attr.value}" of ${attr.attributeId} failed with error "${e.message}", setting to default value.`);
+
+            sql.execute('UPDATE attributes SET value = ? WHERE attributeId = ?',
+                ["multi,text", attr.attributeId]);
+
+            continue;
+        }
+
+        const tokens = [];
+
+        if (obj.isPromoted) {
+            tokens.push('promoted');
+        }
+
+        if (obj.multiplicityType === 'singlevalue') {
+            tokens.push('single');
+        } else if (obj.multiplicityType === 'multivalue') {
+            tokens.push('multi');
+        }
+
+        if (obj.labelType) {
+            tokens.push(obj.labelType);
+        }
+
+        if (obj.numberPrecision) {
+            tokens.push('precision='+obj.numberPrecision);
+        }
+
+        const newValue = tokens.join(',');
+
+        sql.execute('UPDATE attributes SET value = ? WHERE attributeId = ?', [newValue, attr.attributeId]);
+    }
+
+    for (const attr of sql.getRows("SELECT * FROM attributes WHERE name LIKE 'relation:%'")) {
+        let obj;
+
+        try {
+            obj = JSON.parse(attr.value);
+        }
+        catch (e) {
+            console.log(`Parsing attribute definition "${attr.value}" of ${attr.attributeId} failed with error "${e.message}", setting to default value.`);
+
+            sql.execute('UPDATE attributes SET value = ? WHERE attributeId = ?',
+                ["multi", attr.attributeId]);
+
+            continue;
+        }
+
+        const tokens = [];
+
+        if (obj.isPromoted) {
+            tokens.push('promoted');
+        }
+
+        if (obj.multiplicityType === 'singlevalue') {
+            tokens.push('single');
+        } else if (obj.multiplicityType === 'multivalue') {
+            tokens.push('multi');
+        }
+
+        if (obj.inverseRelation) {
+            tokens.push('inverse=' + obj.inverseRelation);
+        }
+
+        const newValue = tokens.join(',');
+
+        sql.execute('UPDATE attributes SET value = ? WHERE attributeId = ?', [newValue, attr.attributeId]);
+    }
+};
--- a/db/migrations/0162__drop_source_ids.sql
+++ b/db/migrations/0162__drop_source_ids.sql
@@ -0,0 +1 @@
+DROP TABLE source_ids;
--- a/db/migrations/0163__rename_sync_to_entity_changes.sql
+++ b/db/migrations/0163__rename_sync_to_entity_changes.sql
@@ -0,0 +1 @@
+ALTER TABLE sync RENAME TO entity_changes;
--- a/db/migrations/0164__rename_utcSyncDate.sql
+++ b/db/migrations/0164__rename_utcSyncDate.sql
@@ -0,0 +1,22 @@
+CREATE TABLE IF NOT EXISTS "mig_entity_changes" (
+                                                `id`	INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+                                                `entityName`	TEXT NOT NULL,
+                                                `entityId`	TEXT NOT NULL,
+                                                `sourceId` TEXT NOT NULL,
+                                                `isSynced` INTEGER default 0 not null,
+                                                `utcChangedDate`	TEXT NOT NULL);
+
+INSERT INTO mig_entity_changes (id, entityName, entityId, sourceId, isSynced, utcChangedDate)
+    SELECT id, entityName, entityId, sourceId, isSynced, utcSyncDate FROM entity_changes;
+
+DROP TABLE entity_changes;
+
+ALTER TABLE mig_entity_changes RENAME TO entity_changes;
+
+CREATE UNIQUE INDEX `IDX_entityChanges_entityName_entityId` ON "entity_changes" (
+                                                                                 `entityName`,
+                                                                                 `entityId`
+    );
+CREATE INDEX `IDX_entityChanges_utcChangedDate` ON "entity_changes" (
+                                                                  `utcChangedDate`
+    );
--- a/db/migrations/0165__move_contentLength.sql
+++ b/db/migrations/0165__move_contentLength.sql
@@ -0,0 +1,55 @@
+CREATE TABLE IF NOT EXISTS "notes_mig" (
+                                       `noteId`	TEXT NOT NULL,
+                                       `title`	TEXT NOT NULL DEFAULT "note",
+                                       `isProtected`	INT NOT NULL DEFAULT 0,
+                                       `type` TEXT NOT NULL DEFAULT 'text',
+                                       `mime` TEXT NOT NULL DEFAULT 'text/html',
+                                       `hash` TEXT DEFAULT "" NOT NULL,
+                                       `isDeleted`	INT NOT NULL DEFAULT 0,
+                                       `deleteId`   TEXT DEFAULT NULL,
+                                       `isErased`	INT NOT NULL DEFAULT 0,
+                                       `dateCreated`	TEXT NOT NULL,
+                                       `dateModified`	TEXT NOT NULL,
+                                       `utcDateCreated`	TEXT NOT NULL,
+                                       `utcDateModified`	TEXT NOT NULL,
+                                       PRIMARY KEY(`noteId`));
+
+INSERT INTO notes_mig (noteId, title, isProtected, type, mime, hash, isDeleted, deleteId, isErased, dateCreated, dateModified, utcDateCreated, utcDateModified)
+    SELECT noteId, title, isProtected, type, mime, hash, isDeleted, deleteId, isErased, dateCreated, dateModified, utcDateCreated, utcDateModified FROM notes;
+
+DROP TABLE notes;
+ALTER TABLE notes_mig RENAME TO notes;
+
+CREATE INDEX `IDX_notes_isDeleted` ON `notes` (`isDeleted`);
+CREATE INDEX `IDX_notes_title` ON `notes` (`title`);
+CREATE INDEX `IDX_notes_type` ON `notes` (`type`);
+CREATE INDEX `IDX_notes_dateCreated` ON `notes` (`dateCreated`);
+CREATE INDEX `IDX_notes_dateModified` ON `notes` (`dateModified`);
+CREATE INDEX `IDX_notes_utcDateModified` ON `notes` (`utcDateModified`);
+CREATE INDEX `IDX_notes_utcDateCreated` ON `notes` (`utcDateCreated`);
+
+CREATE TABLE IF NOT EXISTS "note_revisions_mig" (`noteRevisionId`	TEXT NOT NULL PRIMARY KEY,
+                                             `noteId`	TEXT NOT NULL,
+                                             `title`	TEXT,
+                                             `isErased`	INT NOT NULL DEFAULT 0,
+                                             `isProtected`	INT NOT NULL DEFAULT 0,
+                                             `utcDateLastEdited` TEXT NOT NULL,
+                                             `utcDateCreated` TEXT NOT NULL,
+                                             `utcDateModified` TEXT NOT NULL,
+                                             `dateLastEdited` TEXT NOT NULL,
+                                             `dateCreated` TEXT NOT NULL,
+                                             type TEXT DEFAULT '' NOT NULL,
+                                             mime TEXT DEFAULT '' NOT NULL,
+                                             hash TEXT DEFAULT '' NOT NULL);
+
+INSERT INTO note_revisions_mig (noteRevisionId, noteId, title, isErased, isProtected, utcDateLastEdited, utcDateCreated, utcDateModified, dateLastEdited, dateCreated, type, mime, hash)
+SELECT noteRevisionId, noteId, title, isErased, isProtected, utcDateLastEdited, utcDateCreated, utcDateModified, dateLastEdited, dateCreated, type, mime, hash FROM note_revisions;
+
+DROP TABLE note_revisions;
+ALTER TABLE note_revisions_mig RENAME TO note_revisions;
+
+CREATE INDEX `IDX_note_revisions_noteId` ON `note_revisions` (`noteId`);
+CREATE INDEX `IDX_note_revisions_utcDateCreated` ON `note_revisions` (`utcDateCreated`);
+CREATE INDEX `IDX_note_revisions_utcDateLastEdited` ON `note_revisions` (`utcDateLastEdited`);
+CREATE INDEX `IDX_note_revisions_dateCreated` ON `note_revisions` (`dateCreated`);
+CREATE INDEX `IDX_note_revisions_dateLastEdited` ON `note_revisions` (`dateLastEdited`);
--- a/db/migrations/0166__add_dateModified_to_note_content.sql
+++ b/db/migrations/0166__add_dateModified_to_note_content.sql
@@ -0,0 +1,20 @@
+CREATE TABLE IF NOT EXISTS "note_contents_mig" (
+                                               `noteId`	TEXT NOT NULL,
+                                               `content`	TEXT NULL DEFAULT NULL,
+                                               `hash` TEXT DEFAULT "" NOT NULL,
+                                               `dateModified` TEXT NOT NULL,
+                                               `utcDateModified` TEXT NOT NULL,
+                                               PRIMARY KEY(`noteId`)
+);
+
+INSERT INTO note_contents_mig (noteId, content, hash, dateModified, utcDateModified)
+    SELECT noteId,
+           content,
+           hash,
+           (SELECT dateModified FROM notes WHERE noteId = note_contents.noteId),
+           utcDateModified
+    FROM note_contents;
+
+DROP TABLE note_contents;
+
+ALTER TABLE note_contents_mig RENAME TO note_contents;
--- a/db/migrations/0167__remove_activateParentNote.sql
+++ b/db/migrations/0167__remove_activateParentNote.sql
@@ -0,0 +1 @@
+DELETE FROM options WHERE name = 'keyboardShortcutsActivateParentNote';
--- a/db/schema.sql
+++ b/db/schema.sql
@@ -1,8 +1,3 @@
-CREATE TABLE IF NOT EXISTS "source_ids" (
-                                          `sourceId`	TEXT NOT NULL,
-                                          `utcDateCreated`	TEXT NOT NULL,
-                                          PRIMARY KEY(`sourceId`)
-);
 CREATE TABLE IF NOT EXISTS "api_tokens"
 (
  apiTokenId TEXT PRIMARY KEY NOT NULL,
@@ -19,13 +14,6 @@ CREATE TABLE IF NOT EXISTS "options"
  utcDateCreated TEXT not null,
  utcDateModified TEXT NOT NULL
 );
-CREATE TABLE IF NOT EXISTS "note_contents" (
-                                                   `noteId`	TEXT NOT NULL,
-                                                   `content`	TEXT NULL DEFAULT NULL,
-                                                   `hash` TEXT DEFAULT "" NOT NULL,
-                                                   `utcDateModified` TEXT NOT NULL,
-                                                   PRIMARY KEY(`noteId`)
-);
 CREATE TABLE recent_notes
 (
    noteId TEXT not null primary key,
@@ -38,50 +26,6 @@ CREATE TABLE IF NOT EXISTS "note_revision_contents" (`noteRevisionId`	TEXT NOT N
                                                 `content`	TEXT,
                                                 hash TEXT DEFAULT '' NOT NULL,
                                                 `utcDateModified` TEXT NOT NULL);
-CREATE TABLE IF NOT EXISTS "note_revisions" (`noteRevisionId`	TEXT NOT NULL PRIMARY KEY,
-                                                 `noteId`	TEXT NOT NULL,
-                                                 `title`	TEXT,
-                                                 `contentLength`	INT NOT NULL,
-                                                 `isErased`	INT NOT NULL DEFAULT 0,
-                                                 `isProtected`	INT NOT NULL DEFAULT 0,
-                                                 `utcDateLastEdited` TEXT NOT NULL,
-                                                 `utcDateCreated` TEXT NOT NULL,
-                                                 `utcDateModified` TEXT NOT NULL,
-                                                 `dateLastEdited` TEXT NOT NULL,
-                                                 `dateCreated` TEXT NOT NULL,
-                                                 type TEXT DEFAULT '' NOT NULL,
-                                                 mime TEXT DEFAULT '' NOT NULL,
-                                                 hash TEXT DEFAULT '' NOT NULL);
-CREATE INDEX `IDX_note_revisions_noteId` ON `note_revisions` (`noteId`);
-CREATE INDEX `IDX_note_revisions_utcDateCreated` ON `note_revisions` (`utcDateCreated`);
-CREATE INDEX `IDX_note_revisions_utcDateLastEdited` ON `note_revisions` (`utcDateLastEdited`);
-CREATE INDEX `IDX_note_revisions_dateCreated` ON `note_revisions` (`dateCreated`);
-CREATE INDEX `IDX_note_revisions_dateLastEdited` ON `note_revisions` (`dateLastEdited`);
-CREATE INDEX IDX_source_ids_utcDateCreated
-    on source_ids (utcDateCreated);
-CREATE TABLE IF NOT EXISTS "notes" (
-                                           `noteId`	TEXT NOT NULL,
-                                           `title`	TEXT NOT NULL DEFAULT "note",
-                                           `contentLength`	INT NOT NULL,
-                                           `isProtected`	INT NOT NULL DEFAULT 0,
-                                           `type` TEXT NOT NULL DEFAULT 'text',
-                                           `mime` TEXT NOT NULL DEFAULT 'text/html',
-                                           `hash` TEXT DEFAULT "" NOT NULL,
-                                           `isDeleted`	INT NOT NULL DEFAULT 0,
-                                           `deleteId`   TEXT DEFAULT NULL,
-                                           `isErased`	INT NOT NULL DEFAULT 0,
-                                           `dateCreated`	TEXT NOT NULL,
-                                           `dateModified`	TEXT NOT NULL,
-                                           `utcDateCreated`	TEXT NOT NULL,
-                                           `utcDateModified`	TEXT NOT NULL,
-                                           PRIMARY KEY(`noteId`));
-CREATE INDEX `IDX_notes_isDeleted` ON `notes` (`isDeleted`);
-CREATE INDEX `IDX_notes_title` ON `notes` (`title`);
-CREATE INDEX `IDX_notes_type` ON `notes` (`type`);
-CREATE INDEX `IDX_notes_dateCreated` ON `notes` (`dateCreated`);
-CREATE INDEX `IDX_notes_dateModified` ON `notes` (`dateModified`);
-CREATE INDEX `IDX_notes_utcDateModified` ON `notes` (`utcDateModified`);
-CREATE INDEX `IDX_notes_utcDateCreated` ON `notes` (`utcDateCreated`);
 CREATE TABLE IF NOT EXISTS "branches" (
                                          `branchId`	TEXT NOT NULL,
                                          `noteId`	TEXT NOT NULL,
@@ -117,17 +61,65 @@ CREATE INDEX IDX_attributes_noteId_index
    on attributes (noteId);
 CREATE INDEX IDX_attributes_value_index
    on attributes (value);
-CREATE TABLE IF NOT EXISTS "sync" (
-    `id`	INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
-    `entityName`	TEXT NOT NULL,
-    `entityId`	TEXT NOT NULL,
-    `sourceId` TEXT NOT NULL,
-    `isSynced` INTEGER default 0 not null,
-    `utcSyncDate`	TEXT NOT NULL);
-CREATE UNIQUE INDEX `IDX_sync_entityName_entityId` ON `sync` (
-                                                              `entityName`,
-                                                              `entityId`
+CREATE TABLE IF NOT EXISTS "entity_changes" (
+                                                `id`	INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+                                                `entityName`	TEXT NOT NULL,
+                                                `entityId`	TEXT NOT NULL,
+                                                `sourceId` TEXT NOT NULL,
+                                                `isSynced` INTEGER default 0 not null,
+                                                `utcChangedDate`	TEXT NOT NULL);
+CREATE UNIQUE INDEX `IDX_entityChanges_entityName_entityId` ON "entity_changes" (
+                                                                                 `entityName`,
+                                                                                 `entityId`
    );
-CREATE INDEX `IDX_sync_utcSyncDate` ON `sync` (
-                                               `utcSyncDate`
+CREATE INDEX `IDX_entityChanges_utcChangedDate` ON "entity_changes" (
+                                                                  `utcChangedDate`
    );
+CREATE TABLE IF NOT EXISTS "notes" (
+                                       `noteId`	TEXT NOT NULL,
+                                       `title`	TEXT NOT NULL DEFAULT "note",
+                                       `isProtected`	INT NOT NULL DEFAULT 0,
+                                       `type` TEXT NOT NULL DEFAULT 'text',
+                                       `mime` TEXT NOT NULL DEFAULT 'text/html',
+                                       `hash` TEXT DEFAULT "" NOT NULL,
+                                       `isDeleted`	INT NOT NULL DEFAULT 0,
+                                       `deleteId`   TEXT DEFAULT NULL,
+                                       `isErased`	INT NOT NULL DEFAULT 0,
+                                       `dateCreated`	TEXT NOT NULL,
+                                       `dateModified`	TEXT NOT NULL,
+                                       `utcDateCreated`	TEXT NOT NULL,
+                                       `utcDateModified`	TEXT NOT NULL,
+                                       PRIMARY KEY(`noteId`));
+CREATE INDEX `IDX_notes_isDeleted` ON `notes` (`isDeleted`);
+CREATE INDEX `IDX_notes_title` ON `notes` (`title`);
+CREATE INDEX `IDX_notes_type` ON `notes` (`type`);
+CREATE INDEX `IDX_notes_dateCreated` ON `notes` (`dateCreated`);
+CREATE INDEX `IDX_notes_dateModified` ON `notes` (`dateModified`);
+CREATE INDEX `IDX_notes_utcDateModified` ON `notes` (`utcDateModified`);
+CREATE INDEX `IDX_notes_utcDateCreated` ON `notes` (`utcDateCreated`);
+CREATE TABLE IF NOT EXISTS "note_revisions" (`noteRevisionId`	TEXT NOT NULL PRIMARY KEY,
+                                             `noteId`	TEXT NOT NULL,
+                                             `title`	TEXT,
+                                             `isErased`	INT NOT NULL DEFAULT 0,
+                                             `isProtected`	INT NOT NULL DEFAULT 0,
+                                             `utcDateLastEdited` TEXT NOT NULL,
+                                             `utcDateCreated` TEXT NOT NULL,
+                                             `utcDateModified` TEXT NOT NULL,
+                                             `dateLastEdited` TEXT NOT NULL,
+                                             `dateCreated` TEXT NOT NULL,
+                                             type TEXT DEFAULT '' NOT NULL,
+                                             mime TEXT DEFAULT '' NOT NULL,
+                                             hash TEXT DEFAULT '' NOT NULL);
+CREATE INDEX `IDX_note_revisions_noteId` ON `note_revisions` (`noteId`);
+CREATE INDEX `IDX_note_revisions_utcDateCreated` ON `note_revisions` (`utcDateCreated`);
+CREATE INDEX `IDX_note_revisions_utcDateLastEdited` ON `note_revisions` (`utcDateLastEdited`);
+CREATE INDEX `IDX_note_revisions_dateCreated` ON `note_revisions` (`dateCreated`);
+CREATE INDEX `IDX_note_revisions_dateLastEdited` ON `note_revisions` (`dateLastEdited`);
+CREATE TABLE IF NOT EXISTS "note_contents" (
+                                               `noteId`	TEXT NOT NULL,
+                                               `content`	TEXT NULL DEFAULT NULL,
+                                               `hash` TEXT DEFAULT "" NOT NULL,
+                                               `dateModified` TEXT NOT NULL,
+                                               `utcDateModified` TEXT NOT NULL,
+                                               PRIMARY KEY(`noteId`)
+);
--- a/docs/backend_api/ApiToken.html
+++ b/docs/backend_api/ApiToken.html
@@ -293,7 +293,7 @@
 <br class="clear">

 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.3</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.4</a>
 </footer>

 <script> prettyPrint(); </script>
--- a/docs/backend_api/Attribute.html
+++ b/docs/backend_api/Attribute.html
@@ -272,6 +272,32 @@

    

+        <tr>
+            
+                <td class="name"><code>deleteId</code></td>
+            
+
+            <td class="type">
+            
+                
+<span class="param-type">string</span>
+|
+
+<span class="param-type">null</span>
+
+
+            
+            </td>
+
+            
+
+            
+
+            <td class="description last">ID identifying delete transaction</td>
+        </tr>
+
+    
+
        <tr>
            
                <td class="name"><code>utcDateCreated</code></td>
@@ -352,7 +378,7 @@
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="entities_attribute.js.html">entities/attribute.js</a>, <a href="entities_attribute.js.html#line29">line 29</a>
+        <a href="entities_attribute.js.html">entities/attribute.js</a>, <a href="entities_attribute.js.html#line30">line 30</a>
    </li></ul></dd>
    

@@ -467,7 +493,7 @@
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="entities_attribute.js.html">entities/attribute.js</a>, <a href="entities_attribute.js.html#line46">line 46</a>
+        <a href="entities_attribute.js.html">entities/attribute.js</a>, <a href="entities_attribute.js.html#line47">line 47</a>
    </li></ul></dd>
    

@@ -569,7 +595,7 @@
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="entities_attribute.js.html">entities/attribute.js</a>, <a href="entities_attribute.js.html#line57">line 57</a>
+        <a href="entities_attribute.js.html">entities/attribute.js</a>, <a href="entities_attribute.js.html#line54">line 54</a>
    </li></ul></dd>
    

@@ -671,7 +697,7 @@
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="entities_attribute.js.html">entities/attribute.js</a>, <a href="entities_attribute.js.html#line76">line 76</a>
+        <a href="entities_attribute.js.html">entities/attribute.js</a>, <a href="entities_attribute.js.html#line69">line 69</a>
    </li></ul></dd>
    

@@ -741,7 +767,7 @@
 <br class="clear">

 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.3</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.4</a>
 </footer>

 <script> prettyPrint(); </script>
--- a/docs/backend_api/BackendScriptApi.html
+++ b/docs/backend_api/BackendScriptApi.html
@@ -351,69 +351,6 @@

        
            
-<h4 class="name" id="refreshTree"><span class="type-signature"></span>refreshTree<span class="type-signature"></span></h4>
-
-
-
-
-<div class="description">
-    Trigger tree refresh in all connected clients. This is required when some tree change happens in
-the backend.
-</div>
-
-
-
-
-
-
-
-<dl class="details">
-
-    
-
-    
-
-    
-
-    
-
-    
-
-    
-
-    
-
-    
-
-    
-
-    
-
-    
-
-    
-
-    
-    <dt class="tag-source">Source:</dt>
-    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line394">line 394</a>
-    </li></ul></dd>
-    
-
-    
-
-    
-
-    
-</dl>
-
-
-
-
-
-
-        
-            
 <h4 class="name" id="startNote"><span class="type-signature"></span>startNote<span class="type-signature"></span></h4>


@@ -1117,6 +1054,8 @@ JSON MIME type. See also createNewNote() for more options.
    

    
+        <dt class="important tag-deprecated">Deprecated:</dt><dd><ul class="dummy"><li>please use createNote() API method instead</li></ul></dd>
+    

    

@@ -1129,7 +1068,7 @@ JSON MIME type. See also createNewNote() for more options.
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line258">line 258</a>
+        <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line259">line 259</a>
    </li></ul></dd>
    

@@ -1815,7 +1754,7 @@ JSON MIME type. See also createNewNote() for more options.
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line399">line 399</a>
+        <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line398">line 398</a>
    </li></ul></dd>
    

@@ -2279,7 +2218,7 @@ JSON MIME type. See also createNewNote() for more options.
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line314">line 314</a>
+        <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line315">line 315</a>
    </li></ul></dd>
    

@@ -3047,7 +2986,7 @@ if some action needs to happen on only one specific instance.
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line341">line 341</a>
+        <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line342">line 342</a>
    </li></ul></dd>
    

@@ -3700,7 +3639,7 @@ if some action needs to happen on only one specific instance.
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line305">line 305</a>
+        <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line306">line 306</a>
    </li></ul></dd>
    

@@ -3806,7 +3745,7 @@ if some action needs to happen on only one specific instance.
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line322">line 322</a>
+        <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line323">line 323</a>
    </li></ul></dd>
    

@@ -3984,7 +3923,7 @@ if some action needs to happen on only one specific instance.
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line332">line 332</a>
+        <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line333">line 333</a>
    </li></ul></dd>
    

@@ -4139,7 +4078,7 @@ if some action needs to happen on only one specific instance.
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line350">line 350</a>
+        <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line351">line 351</a>
    </li></ul></dd>
    

@@ -4289,7 +4228,93 @@ if some action needs to happen on only one specific instance.
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line297">line 297</a>
+        <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line298">line 298</a>
+    </li></ul></dd>
+    
+
+    
+
+    
+
+    
+</dl>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+        
+            
+
+    
+
+    
+    <h4 class="name" id="refreshTree"><span class="type-signature"></span>refreshTree<span class="signature">()</span><span class="type-signature"></span></h4>
+    
+
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+<dl class="details">
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+        <dt class="important tag-deprecated">Deprecated:</dt><dd><ul class="dummy"><li>- this is now no-op since all the changes should be gracefully handled per widget</li></ul></dd>
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+    <dt class="tag-source">Source:</dt>
+    <dd class="tag-source"><ul class="dummy"><li>
+        <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line393">line 393</a>
    </li></ul></dd>
    

@@ -4792,7 +4817,7 @@ This method looks similar to toggleNoteInParent() but differs because we're look
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line371">line 371</a>
+        <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line372">line 372</a>
    </li></ul></dd>
    

@@ -4925,7 +4950,7 @@ This method looks similar to toggleNoteInParent() but differs because we're look
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line357">line 357</a>
+        <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line358">line 358</a>
    </li></ul></dd>
    

@@ -5300,7 +5325,7 @@ transactional by default.
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line384">line 384</a>
+        <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line385">line 385</a>
    </li></ul></dd>
    

@@ -5374,7 +5399,7 @@ transactional by default.
 <br class="clear">

 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.3</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.4</a>
 </footer>

 <script> prettyPrint(); </script>
--- a/docs/backend_api/Branch.html
+++ b/docs/backend_api/Branch.html
@@ -250,6 +250,32 @@ Each note can have multiple (at least one) branches, meaning it can be placed in

    

+        <tr>
+            
+                <td class="name"><code>deleteId</code></td>
+            
+
+            <td class="type">
+            
+                
+<span class="param-type">string</span>
+|
+
+<span class="param-type">null</span>
+
+
+            
+            </td>
+
+            
+
+            
+
+            <td class="description last">ID identifying delete transaction</td>
+        </tr>
+
+    
+
        <tr>
            
                <td class="name"><code>utcDateModified</code></td>
@@ -330,7 +356,7 @@ Each note can have multiple (at least one) branches, meaning it can be placed in
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="entities_branch.js.html">entities/branch.js</a>, <a href="entities_branch.js.html#line30">line 30</a>
+        <a href="entities_branch.js.html">entities/branch.js</a>, <a href="entities_branch.js.html#line25">line 25</a>
    </li></ul></dd>
    

@@ -397,7 +423,7 @@ Each note can have multiple (at least one) branches, meaning it can be placed in
    

    
-    <h4 class="name" id="getNote"><span class="type-signature">(async) </span>getNote<span class="signature">()</span><span class="type-signature"> &rarr; {<a href="Note.html">Note</a>|null}</span></h4>
+    <h4 class="name" id="getNote"><span class="type-signature">(async) </span>getNote<span class="signature">()</span><span class="type-signature"> &rarr; {Promise.&lt;(<a href="Note.html">Note</a>|null)>}</span></h4>
    

    
@@ -445,7 +471,7 @@ Each note can have multiple (at least one) branches, meaning it can be placed in
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="entities_branch.js.html">entities/branch.js</a>, <a href="entities_branch.js.html#line38">line 38</a>
+        <a href="entities_branch.js.html">entities/branch.js</a>, <a href="entities_branch.js.html#line32">line 32</a>
    </li></ul></dd>
    

@@ -481,10 +507,109 @@ Each note can have multiple (at least one) branches, meaning it can be placed in
    </dt>
    <dd>
        
-<span class="param-type"><a href="Note.html">Note</a></span>
-|
+<span class="param-type">Promise.&lt;(<a href="Note.html">Note</a>|null)></span>

-<span class="param-type">null</span>
+
+    </dd>
+</dl>
+
+    
+
+
+
+
+
+        
+            
+
+    
+
+    
+    <h4 class="name" id="getParentNote"><span class="type-signature">(async) </span>getParentNote<span class="signature">()</span><span class="type-signature"> &rarr; {Promise.&lt;(<a href="Note.html">Note</a>|null)>}</span></h4>
+    
+
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+<dl class="details">
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+    <dt class="tag-source">Source:</dt>
+    <dd class="tag-source"><ul class="dummy"><li>
+        <a href="entities_branch.js.html">entities/branch.js</a>, <a href="entities_branch.js.html#line37">line 37</a>
+    </li></ul></dd>
+    
+
+    
+
+    
+
+    
+</dl>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+<h5>Returns:</h5>
+
+        
+
+
+<dl>
+    <dt>
+        Type
+    </dt>
+    <dd>
+        
+<span class="param-type">Promise.&lt;(<a href="Note.html">Note</a>|null)></span>


    </dd>
@@ -518,7 +643,7 @@ Each note can have multiple (at least one) branches, meaning it can be placed in
 <br class="clear">

 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.3</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.4</a>
 </footer>

 <script> prettyPrint(); </script>
--- a/docs/backend_api/Entity.html
+++ b/docs/backend_api/Entity.html
@@ -218,7 +218,7 @@
 <br class="clear">

 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.3</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.4</a>
 </footer>

 <script> prettyPrint(); </script>
--- a/docs/backend_api/Note.html
+++ b/docs/backend_api/Note.html
@@ -293,6 +293,32 @@

    

+        <tr>
+            
+                <td class="name"><code>deleteId</code></td>
+            
+
+            <td class="type">
+            
+                
+<span class="param-type">string</span>
+|
+
+<span class="param-type">null</span>
+
+
+            
+            </td>
+
+            
+
+            
+
+            <td class="description last">ID identifying delete transaction</td>
+        </tr>
+
+    
+
        <tr>
            
                <td class="name"><code>isErased</code></td>
@@ -442,7 +468,7 @@
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="entities_note.js.html">entities/note.js</a>, <a href="entities_note.js.html#line43">line 43</a>
+        <a href="entities_note.js.html">entities/note.js</a>, <a href="entities_note.js.html#line44">line 44</a>
    </li></ul></dd>
    

@@ -557,7 +583,7 @@
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="entities_note.js.html">entities/note.js</a>, <a href="entities_note.js.html#line540">line 540</a>
+        <a href="entities_note.js.html">entities/note.js</a>, <a href="entities_note.js.html#line548">line 548</a>
    </li></ul></dd>
    

@@ -659,7 +685,7 @@
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="entities_note.js.html">entities/note.js</a>, <a href="entities_note.js.html#line868">line 868</a>
+        <a href="entities_note.js.html">entities/note.js</a>, <a href="entities_note.js.html#line876">line 876</a>
    </li></ul></dd>
    

@@ -837,7 +863,7 @@
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="entities_note.js.html">entities/note.js</a>, <a href="entities_note.js.html#line436">line 436</a>
+        <a href="entities_note.js.html">entities/note.js</a>, <a href="entities_note.js.html#line444">line 444</a>
    </li></ul></dd>
    

@@ -1037,7 +1063,7 @@
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="entities_note.js.html">entities/note.js</a>, <a href="entities_note.js.html#line254">line 254</a>
+        <a href="entities_note.js.html">entities/note.js</a>, <a href="entities_note.js.html#line262">line 262</a>
    </li></ul></dd>
    

@@ -1215,7 +1241,7 @@
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="entities_note.js.html">entities/note.js</a>, <a href="entities_note.js.html#line447">line 447</a>
+        <a href="entities_note.js.html">entities/note.js</a>, <a href="entities_note.js.html#line455">line 455</a>
    </li></ul></dd>
    

@@ -1321,7 +1347,7 @@
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="entities_note.js.html">entities/note.js</a>, <a href="entities_note.js.html#line814">line 814</a>
+        <a href="entities_note.js.html">entities/note.js</a>, <a href="entities_note.js.html#line822">line 822</a>
    </li></ul></dd>
    

@@ -1423,7 +1449,7 @@
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="entities_note.js.html">entities/note.js</a>, <a href="entities_note.js.html#line842">line 842</a>
+        <a href="entities_note.js.html">entities/note.js</a>, <a href="entities_note.js.html#line850">line 850</a>
    </li></ul></dd>
    

@@ -1529,7 +1555,7 @@
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="entities_note.js.html">entities/note.js</a>, <a href="entities_note.js.html#line828">line 828</a>
+        <a href="entities_note.js.html">entities/note.js</a>, <a href="entities_note.js.html#line836">line 836</a>
    </li></ul></dd>
    

@@ -1635,7 +1661,7 @@
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="entities_note.js.html">entities/note.js</a>, <a href="entities_note.js.html#line74">line 74</a>
+        <a href="entities_note.js.html">entities/note.js</a>, <a href="entities_note.js.html#line75">line 75</a>
    </li></ul></dd>
    

@@ -1737,7 +1763,7 @@
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="entities_note.js.html">entities/note.js</a>, <a href="entities_note.js.html#line714">line 714</a>
+        <a href="entities_note.js.html">entities/note.js</a>, <a href="entities_note.js.html#line722">line 722</a>
    </li></ul></dd>
    

@@ -1970,7 +1996,7 @@
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="entities_note.js.html">entities/note.js</a>, <a href="entities_note.js.html#line737">line 737</a>
+        <a href="entities_note.js.html">entities/note.js</a>, <a href="entities_note.js.html#line745">line 745</a>
    </li></ul></dd>
    

@@ -2168,7 +2194,7 @@
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="entities_note.js.html">entities/note.js</a>, <a href="entities_note.js.html#line775">line 775</a>
+        <a href="entities_note.js.html">entities/note.js</a>, <a href="entities_note.js.html#line783">line 783</a>
    </li></ul></dd>
    

@@ -2366,7 +2392,7 @@
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="entities_note.js.html">entities/note.js</a>, <a href="entities_note.js.html#line784">line 784</a>
+        <a href="entities_note.js.html">entities/note.js</a>, <a href="entities_note.js.html#line792">line 792</a>
    </li></ul></dd>
    

@@ -2468,7 +2494,7 @@
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="entities_note.js.html">entities/note.js</a>, <a href="entities_note.js.html#line109">line 109</a>
+        <a href="entities_note.js.html">entities/note.js</a>, <a href="entities_note.js.html#line111">line 111</a>
    </li></ul></dd>
    

@@ -2619,7 +2645,7 @@
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="entities_note.js.html">entities/note.js</a>, <a href="entities_note.js.html#line591">line 591</a>
+        <a href="entities_note.js.html">entities/note.js</a>, <a href="entities_note.js.html#line599">line 599</a>
    </li></ul></dd>
    

@@ -2786,7 +2812,7 @@
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="entities_note.js.html">entities/note.js</a>, <a href="entities_note.js.html#line293">line 293</a>
+        <a href="entities_note.js.html">entities/note.js</a>, <a href="entities_note.js.html#line301">line 301</a>
    </li></ul></dd>
    

@@ -2953,7 +2979,7 @@
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="entities_note.js.html">entities/note.js</a>, <a href="entities_note.js.html#line277">line 277</a>
+        <a href="entities_note.js.html">entities/note.js</a>, <a href="entities_note.js.html#line285">line 285</a>
    </li></ul></dd>
    

@@ -3108,7 +3134,7 @@
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="entities_note.js.html">entities/note.js</a>, <a href="entities_note.js.html#line615">line 615</a>
+        <a href="entities_note.js.html">entities/note.js</a>, <a href="entities_note.js.html#line623">line 623</a>
    </li></ul></dd>
    

@@ -3220,7 +3246,7 @@
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="entities_note.js.html">entities/note.js</a>, <a href="entities_note.js.html#line801">line 801</a>
+        <a href="entities_note.js.html">entities/note.js</a>, <a href="entities_note.js.html#line809">line 809</a>
    </li></ul></dd>
    

@@ -3322,7 +3348,7 @@
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="entities_note.js.html">entities/note.js</a>, <a href="entities_note.js.html#line236">line 236</a>
+        <a href="entities_note.js.html">entities/note.js</a>, <a href="entities_note.js.html#line244">line 244</a>
    </li></ul></dd>
    

@@ -3529,7 +3555,7 @@ Use when inheritance is not needed and/or in batch/performance sensitive operati
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="entities_note.js.html">entities/note.js</a>, <a href="entities_note.js.html#line212">line 212</a>
+        <a href="entities_note.js.html">entities/note.js</a>, <a href="entities_note.js.html#line220">line 220</a>
    </li></ul></dd>
    

@@ -3707,7 +3733,7 @@ Use when inheritance is not needed and/or in batch/performance sensitive operati
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="entities_note.js.html">entities/note.js</a>, <a href="entities_note.js.html#line458">line 458</a>
+        <a href="entities_note.js.html">entities/note.js</a>, <a href="entities_note.js.html#line466">line 466</a>
    </li></ul></dd>
    

@@ -3862,7 +3888,7 @@ Use when inheritance is not needed and/or in batch/performance sensitive operati
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="entities_note.js.html">entities/note.js</a>, <a href="entities_note.js.html#line597">line 597</a>
+        <a href="entities_note.js.html">entities/note.js</a>, <a href="entities_note.js.html#line605">line 605</a>
    </li></ul></dd>
    

@@ -4029,7 +4055,7 @@ Use when inheritance is not needed and/or in batch/performance sensitive operati
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="entities_note.js.html">entities/note.js</a>, <a href="entities_note.js.html#line285">line 285</a>
+        <a href="entities_note.js.html">entities/note.js</a>, <a href="entities_note.js.html#line293">line 293</a>
    </li></ul></dd>
    

@@ -4184,7 +4210,7 @@ Use when inheritance is not needed and/or in batch/performance sensitive operati
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="entities_note.js.html">entities/note.js</a>, <a href="entities_note.js.html#line621">line 621</a>
+        <a href="entities_note.js.html">entities/note.js</a>, <a href="entities_note.js.html#line629">line 629</a>
    </li></ul></dd>
    

@@ -4339,7 +4365,7 @@ Use when inheritance is not needed and/or in batch/performance sensitive operati
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="entities_note.js.html">entities/note.js</a>, <a href="entities_note.js.html#line609">line 609</a>
+        <a href="entities_note.js.html">entities/note.js</a>, <a href="entities_note.js.html#line617">line 617</a>
    </li></ul></dd>
    

@@ -4506,7 +4532,7 @@ Use when inheritance is not needed and/or in batch/performance sensitive operati
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="entities_note.js.html">entities/note.js</a>, <a href="entities_note.js.html#line309">line 309</a>
+        <a href="entities_note.js.html">entities/note.js</a>, <a href="entities_note.js.html#line317">line 317</a>
    </li></ul></dd>
    

@@ -4661,7 +4687,7 @@ Use when inheritance is not needed and/or in batch/performance sensitive operati
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="entities_note.js.html">entities/note.js</a>, <a href="entities_note.js.html#line649">line 649</a>
+        <a href="entities_note.js.html">entities/note.js</a>, <a href="entities_note.js.html#line657">line 657</a>
    </li></ul></dd>
    

@@ -4819,7 +4845,7 @@ Use when inheritance is not needed and/or in batch/performance sensitive operati
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="entities_note.js.html">entities/note.js</a>, <a href="entities_note.js.html#line633">line 633</a>
+        <a href="entities_note.js.html">entities/note.js</a>, <a href="entities_note.js.html#line641">line 641</a>
    </li></ul></dd>
    

@@ -4925,7 +4951,7 @@ Use when inheritance is not needed and/or in batch/performance sensitive operati
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="entities_note.js.html">entities/note.js</a>, <a href="entities_note.js.html#line854">line 854</a>
+        <a href="entities_note.js.html">entities/note.js</a>, <a href="entities_note.js.html#line862">line 862</a>
    </li></ul></dd>
    

@@ -5080,7 +5106,7 @@ Use when inheritance is not needed and/or in batch/performance sensitive operati
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="entities_note.js.html">entities/note.js</a>, <a href="entities_note.js.html#line603">line 603</a>
+        <a href="entities_note.js.html">entities/note.js</a>, <a href="entities_note.js.html#line611">line 611</a>
    </li></ul></dd>
    

@@ -5247,7 +5273,7 @@ Use when inheritance is not needed and/or in batch/performance sensitive operati
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="entities_note.js.html">entities/note.js</a>, <a href="entities_note.js.html#line332">line 332</a>
+        <a href="entities_note.js.html">entities/note.js</a>, <a href="entities_note.js.html#line340">line 340</a>
    </li></ul></dd>
    

@@ -5414,7 +5440,7 @@ Use when inheritance is not needed and/or in batch/performance sensitive operati
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="entities_note.js.html">entities/note.js</a>, <a href="entities_note.js.html#line301">line 301</a>
+        <a href="entities_note.js.html">entities/note.js</a>, <a href="entities_note.js.html#line309">line 309</a>
    </li></ul></dd>
    

@@ -5569,7 +5595,7 @@ Use when inheritance is not needed and/or in batch/performance sensitive operati
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="entities_note.js.html">entities/note.js</a>, <a href="entities_note.js.html#line639">line 639</a>
+        <a href="entities_note.js.html">entities/note.js</a>, <a href="entities_note.js.html#line647">line 647</a>
    </li></ul></dd>
    

@@ -5739,7 +5765,7 @@ Use when inheritance is not needed and/or in batch/performance sensitive operati
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="entities_note.js.html">entities/note.js</a>, <a href="entities_note.js.html#line317">line 317</a>
+        <a href="entities_note.js.html">entities/note.js</a>, <a href="entities_note.js.html#line325">line 325</a>
    </li></ul></dd>
    

@@ -5890,7 +5916,7 @@ Use when inheritance is not needed and/or in batch/performance sensitive operati
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="entities_note.js.html">entities/note.js</a>, <a href="entities_note.js.html#line627">line 627</a>
+        <a href="entities_note.js.html">entities/note.js</a>, <a href="entities_note.js.html#line635">line 635</a>
    </li></ul></dd>
    

@@ -6000,7 +6026,7 @@ Use when inheritance is not needed and/or in batch/performance sensitive operati
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="entities_note.js.html">entities/note.js</a>, <a href="entities_note.js.html#line791">line 791</a>
+        <a href="entities_note.js.html">entities/note.js</a>, <a href="entities_note.js.html#line799">line 799</a>
    </li></ul></dd>
    

@@ -6102,7 +6128,7 @@ Use when inheritance is not needed and/or in batch/performance sensitive operati
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="entities_note.js.html">entities/note.js</a>, <a href="entities_note.js.html#line183">line 183</a>
+        <a href="entities_note.js.html">entities/note.js</a>, <a href="entities_note.js.html#line191">line 191</a>
    </li></ul></dd>
    

@@ -6208,7 +6234,7 @@ Use when inheritance is not needed and/or in batch/performance sensitive operati
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="entities_note.js.html">entities/note.js</a>, <a href="entities_note.js.html#line245">line 245</a>
+        <a href="entities_note.js.html">entities/note.js</a>, <a href="entities_note.js.html#line253">line 253</a>
    </li></ul></dd>
    

@@ -6386,7 +6412,7 @@ Use when inheritance is not needed and/or in batch/performance sensitive operati
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="entities_note.js.html">entities/note.js</a>, <a href="entities_note.js.html#line418">line 418</a>
+        <a href="entities_note.js.html">entities/note.js</a>, <a href="entities_note.js.html#line426">line 426</a>
    </li></ul></dd>
    

@@ -6492,7 +6518,7 @@ Use when inheritance is not needed and/or in batch/performance sensitive operati
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="entities_note.js.html">entities/note.js</a>, <a href="entities_note.js.html#line821">line 821</a>
+        <a href="entities_note.js.html">entities/note.js</a>, <a href="entities_note.js.html#line829">line 829</a>
    </li></ul></dd>
    

@@ -6647,7 +6673,7 @@ Use when inheritance is not needed and/or in batch/performance sensitive operati
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="entities_note.js.html">entities/note.js</a>, <a href="entities_note.js.html#line567">line 567</a>
+        <a href="entities_note.js.html">entities/note.js</a>, <a href="entities_note.js.html#line575">line 575</a>
    </li></ul></dd>
    

@@ -6825,7 +6851,7 @@ Use when inheritance is not needed and/or in batch/performance sensitive operati
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="entities_note.js.html">entities/note.js</a>, <a href="entities_note.js.html#line427">line 427</a>
+        <a href="entities_note.js.html">entities/note.js</a>, <a href="entities_note.js.html#line435">line 435</a>
    </li></ul></dd>
    

@@ -6980,7 +7006,7 @@ Use when inheritance is not needed and/or in batch/performance sensitive operati
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="entities_note.js.html">entities/note.js</a>, <a href="entities_note.js.html#line573">line 573</a>
+        <a href="entities_note.js.html">entities/note.js</a>, <a href="entities_note.js.html#line581">line 581</a>
    </li></ul></dd>
    

@@ -7135,7 +7161,7 @@ Use when inheritance is not needed and/or in batch/performance sensitive operati
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="entities_note.js.html">entities/note.js</a>, <a href="entities_note.js.html#line585">line 585</a>
+        <a href="entities_note.js.html">entities/note.js</a>, <a href="entities_note.js.html#line593">line 593</a>
    </li></ul></dd>
    

@@ -7290,7 +7316,7 @@ Use when inheritance is not needed and/or in batch/performance sensitive operati
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="entities_note.js.html">entities/note.js</a>, <a href="entities_note.js.html#line579">line 579</a>
+        <a href="entities_note.js.html">entities/note.js</a>, <a href="entities_note.js.html#line587">line 587</a>
    </li></ul></dd>
    

@@ -7401,7 +7427,7 @@ Cache is note instance scoped.
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="entities_note.js.html">entities/note.js</a>, <a href="entities_note.js.html#line340">line 340</a>
+        <a href="entities_note.js.html">entities/note.js</a>, <a href="entities_note.js.html#line348">line 348</a>
    </li></ul></dd>
    

@@ -7529,7 +7555,7 @@ Cache is note instance scoped.
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="entities_note.js.html">entities/note.js</a>, <a href="entities_note.js.html#line889">line 889</a>
+        <a href="entities_note.js.html">entities/note.js</a>, <a href="entities_note.js.html#line897">line 897</a>
    </li></ul></dd>
    

@@ -7635,7 +7661,7 @@ Cache is note instance scoped.
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="entities_note.js.html">entities/note.js</a>, <a href="entities_note.js.html#line173">line 173</a>
+        <a href="entities_note.js.html">entities/note.js</a>, <a href="entities_note.js.html#line181">line 181</a>
    </li></ul></dd>
    

@@ -7741,7 +7767,7 @@ Cache is note instance scoped.
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="entities_note.js.html">entities/note.js</a>, <a href="entities_note.js.html#line165">line 165</a>
+        <a href="entities_note.js.html">entities/note.js</a>, <a href="entities_note.js.html#line173">line 173</a>
    </li></ul></dd>
    

@@ -7847,7 +7873,7 @@ Cache is note instance scoped.
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="entities_note.js.html">entities/note.js</a>, <a href="entities_note.js.html#line160">line 160</a>
+        <a href="entities_note.js.html">entities/note.js</a>, <a href="entities_note.js.html#line168">line 168</a>
    </li></ul></dd>
    

@@ -7953,7 +7979,7 @@ Cache is note instance scoped.
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="entities_note.js.html">entities/note.js</a>, <a href="entities_note.js.html#line155">line 155</a>
+        <a href="entities_note.js.html">entities/note.js</a>, <a href="entities_note.js.html#line163">line 163</a>
    </li></ul></dd>
    

@@ -8059,7 +8085,7 @@ Cache is note instance scoped.
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="entities_note.js.html">entities/note.js</a>, <a href="entities_note.js.html#line178">line 178</a>
+        <a href="entities_note.js.html">entities/note.js</a>, <a href="entities_note.js.html#line186">line 186</a>
    </li></ul></dd>
    

@@ -8165,7 +8191,7 @@ Cache is note instance scoped.
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="entities_note.js.html">entities/note.js</a>, <a href="entities_note.js.html#line346">line 346</a>
+        <a href="entities_note.js.html">entities/note.js</a>, <a href="entities_note.js.html#line354">line 354</a>
    </li></ul></dd>
    

@@ -8394,7 +8420,7 @@ Cache is note instance scoped.
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="entities_note.js.html">entities/note.js</a>, <a href="entities_note.js.html#line524">line 524</a>
+        <a href="entities_note.js.html">entities/note.js</a>, <a href="entities_note.js.html#line532">line 532</a>
    </li></ul></dd>
    

@@ -8592,7 +8618,7 @@ Cache is note instance scoped.
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="entities_note.js.html">entities/note.js</a>, <a href="entities_note.js.html#line700">line 700</a>
+        <a href="entities_note.js.html">entities/note.js</a>, <a href="entities_note.js.html#line708">line 708</a>
    </li></ul></dd>
    

@@ -8790,7 +8816,7 @@ Cache is note instance scoped.
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="entities_note.js.html">entities/note.js</a>, <a href="entities_note.js.html#line709">line 709</a>
+        <a href="entities_note.js.html">entities/note.js</a>, <a href="entities_note.js.html#line717">line 717</a>
    </li></ul></dd>
    

@@ -9019,7 +9045,7 @@ Cache is note instance scoped.
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="entities_note.js.html">entities/note.js</a>, <a href="entities_note.js.html#line490">line 490</a>
+        <a href="entities_note.js.html">entities/note.js</a>, <a href="entities_note.js.html#line498">line 498</a>
    </li></ul></dd>
    

@@ -9121,7 +9147,7 @@ Cache is note instance scoped.
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="entities_note.js.html">entities/note.js</a>, <a href="entities_note.js.html#line116">line 116</a>
+        <a href="entities_note.js.html">entities/note.js</a>, <a href="entities_note.js.html#line122">line 122</a>
    </li></ul></dd>
    

@@ -9223,7 +9249,7 @@ Cache is note instance scoped.
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="entities_note.js.html">entities/note.js</a>, <a href="entities_note.js.html#line150">line 150</a>
+        <a href="entities_note.js.html">entities/note.js</a>, <a href="entities_note.js.html#line158">line 158</a>
    </li></ul></dd>
    

@@ -9421,7 +9447,7 @@ Cache is note instance scoped.
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="entities_note.js.html">entities/note.js</a>, <a href="entities_note.js.html#line682">line 682</a>
+        <a href="entities_note.js.html">entities/note.js</a>, <a href="entities_note.js.html#line690">line 690</a>
    </li></ul></dd>
    

@@ -9619,7 +9645,7 @@ Cache is note instance scoped.
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="entities_note.js.html">entities/note.js</a>, <a href="entities_note.js.html#line691">line 691</a>
+        <a href="entities_note.js.html">entities/note.js</a>, <a href="entities_note.js.html#line699">line 699</a>
    </li></ul></dd>
    

@@ -9879,7 +9905,7 @@ Cache is note instance scoped.
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="entities_note.js.html">entities/note.js</a>, <a href="entities_note.js.html#line473">line 473</a>
+        <a href="entities_note.js.html">entities/note.js</a>, <a href="entities_note.js.html#line481">line 481</a>
    </li></ul></dd>
    

@@ -10108,7 +10134,7 @@ Cache is note instance scoped.
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="entities_note.js.html">entities/note.js</a>, <a href="entities_note.js.html#line663">line 663</a>
+        <a href="entities_note.js.html">entities/note.js</a>, <a href="entities_note.js.html#line671">line 671</a>
    </li></ul></dd>
    

@@ -10337,7 +10363,7 @@ Cache is note instance scoped.
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="entities_note.js.html">entities/note.js</a>, <a href="entities_note.js.html#line673">line 673</a>
+        <a href="entities_note.js.html">entities/note.js</a>, <a href="entities_note.js.html#line681">line 681</a>
    </li></ul></dd>
    

@@ -10407,7 +10433,7 @@ Cache is note instance scoped.
 <br class="clear">

 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.3</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.4</a>
 </footer>

 <script> prettyPrint(); </script>
--- a/docs/backend_api/NoteRevision.html
+++ b/docs/backend_api/NoteRevision.html
@@ -744,7 +744,7 @@
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="entities_note_revision.js.html">entities/note_revision.js</a>, <a href="entities_note_revision.js.html#line104">line 104</a>
+        <a href="entities_note_revision.js.html">entities/note_revision.js</a>, <a href="entities_note_revision.js.html#line105">line 105</a>
    </li></ul></dd>
    

@@ -814,7 +814,7 @@
 <br class="clear">

 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.3</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.4</a>
 </footer>

 <script> prettyPrint(); </script>
--- a/docs/backend_api/Option.html
+++ b/docs/backend_api/Option.html
@@ -316,7 +316,7 @@
 <br class="clear">

 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.3</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.4</a>
 </footer>

 <script> prettyPrint(); </script>
--- a/docs/backend_api/RecentNote.html
+++ b/docs/backend_api/RecentNote.html
@@ -293,7 +293,7 @@
 <br class="clear">

 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.3</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.4</a>
 </footer>

 <script> prettyPrint(); </script>
--- a/docs/backend_api/entities_api_token.js.html
+++ b/docs/backend_api/entities_api_token.js.html
@@ -75,7 +75,7 @@ module.exports = ApiToken;</code></pre>
 <br class="clear">

 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.3</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.4</a>
 </footer>

 <script> prettyPrint(); </script>
--- a/docs/backend_api/entities_attribute.js.html
+++ b/docs/backend_api/entities_attribute.js.html
@@ -44,6 +44,7 @@ const sql = require('../services/sql');
 * @property {int} position
 * @property {boolean} isInheritable
 * @property {boolean} isDeleted
+ * @property {string|null} deleteId - ID identifying delete transaction
 * @property {string} utcDateCreated
 * @property {string} utcDateModified
 *
@@ -72,11 +73,7 @@ class Attribute extends Entity {
     * @returns {Promise&lt;Note|null>}
     */
    async getNote() {
-        if (!this.__note) {
-            this.__note = await repository.getEntity("SELECT * FROM notes WHERE noteId = ?", [this.noteId]);
-        }
-
-        return this.__note;
+        return await repository.getNote(this.noteId);
    }

    /**
@@ -91,11 +88,7 @@ class Attribute extends Entity {
            return null;
        }

-        if (!this.__targetNote) {
-            this.__targetNote = await repository.getEntity("SELECT * FROM notes WHERE noteId = ?", [this.value]);
-        }
-
-        return this.__targetNote;
+        return await repository.getNote(this.value);
    }

    /**
@@ -143,6 +136,20 @@ class Attribute extends Entity {
        delete pojo.isOwned;
        delete pojo.__note;
    }
+
+    createClone(type, name, value) {
+        return new Attribute({
+            noteId: this.noteId,
+            type: type,
+            name: name,
+            value: value,
+            position: this.position,
+            isInheritable: this.isInheritable,
+            isDeleted: false,
+            utcDateCreated: this.utcDateCreated,
+            utcDateModified: this.utcDateModified
+        });
+    }
 }

 module.exports = Attribute;</code></pre>
@@ -161,7 +168,7 @@ module.exports = Attribute;</code></pre>
 <br class="clear">

 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.3</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.4</a>
 </footer>

 <script> prettyPrint(); </script>
--- a/docs/backend_api/entities_branch.js.html
+++ b/docs/backend_api/entities_branch.js.html
@@ -44,6 +44,7 @@ const sql = require('../services/sql');
 * @property {string} prefix
 * @property {boolean} isExpanded
 * @property {boolean} isDeleted
+ * @property {string|null} deleteId - ID identifying delete transaction
 * @property {string} utcDateModified
 * @property {string} utcDateCreated
 *
@@ -53,18 +54,16 @@ class Branch extends Entity {
    static get entityName() { return "branches"; }
    static get primaryKeyName() { return "branchId"; }
    // notePosition is not part of hash because it would produce a lot of updates in case of reordering
-    static get hashedProperties() { return ["branchId", "noteId", "parentNoteId", "isDeleted", "prefix"]; }
+    static get hashedProperties() { return ["branchId", "noteId", "parentNoteId", "isDeleted", "deleteId", "prefix"]; }

-    constructor(row = {}) {
-        super(row);
-
-        // used to detect move in note tree
-        this.origParentNoteId = this.parentNoteId;
+    /** @returns {Promise&lt;Note|null>} */
+    async getNote() {
+        return await repository.getNote(this.noteId);
    }

-    /** @returns {Note|null} */
-    async getNote() {
-        return await repository.getEntity("SELECT * FROM notes WHERE noteId = ?", [this.noteId]);
+    /** @returns {Promise&lt;Note|null>} */
+    async getParentNote() {
+        return await repository.getNote(this.parentNoteId);
    }

    async beforeSaving() {
@@ -92,9 +91,17 @@ class Branch extends Entity {
        }
    }

-    // cannot be static!
-    updatePojo(pojo) {
-        delete pojo.origParentNoteId;
+    createClone(parentNoteId, notePosition) {
+        return new Branch({
+            noteId: this.noteId,
+            parentNoteId: parentNoteId,
+            notePosition: notePosition,
+            prefix: this.prefix,
+            isExpanded: this.isExpanded,
+            isDeleted: false,
+            utcDateCreated: this.utcDateCreated,
+            utcDateModified: this.utcDateModified
+        });
    }
 }

@@ -114,7 +121,7 @@ module.exports = Branch;</code></pre>
 <br class="clear">

 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.3</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.4</a>
 </footer>

 <script> prettyPrint(); </script>
--- a/docs/backend_api/entities_entity.js.html
+++ b/docs/backend_api/entities_entity.js.html
@@ -102,7 +102,7 @@ module.exports = Entity;</code></pre>
 <br class="clear">

 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.3</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.4</a>
 </footer>

 <script> prettyPrint(); </script>
--- a/docs/backend_api/entities_note.js.html
+++ b/docs/backend_api/entities_note.js.html
@@ -52,6 +52,7 @@ const RELATION_DEFINITION = 'relation-definition';
 * @property {int} contentLength - length of content
 * @property {boolean} isProtected - true if note is protected
 * @property {boolean} isDeleted - true if note is deleted
+ * @property {string|null} deleteId - ID identifying delete transaction
 * @property {boolean} isErased - true if note's content is erased after it has been deleted
 * @property {string} dateCreated - local date time (with offset)
 * @property {string} dateModified - local date time (with offset)
@@ -63,7 +64,7 @@ const RELATION_DEFINITION = 'relation-definition';
 class Note extends Entity {
    static get entityName() { return "notes"; }
    static get primaryKeyName() { return "noteId"; }
-    static get hashedProperties() { return ["noteId", "title", "type", "isProtected", "isDeleted"]; }
+    static get hashedProperties() { return ["noteId", "title", "type", "mime", "isProtected", "isDeleted", "deleteId"]; }

    /**
     * @param row - object containing database row from "notes" table
@@ -122,21 +123,26 @@ class Note extends Entity {
                    this.content = "";
                }
            }
-
-            if (this.isStringNote()) {
-                this.content = this.content === null
-                    ? ""
-                    : this.content.toString("UTF-8");
-            }
        }

-        return this.content;
+        if (this.isStringNote()) {
+            return this.content === null
+                ? ""
+                : this.content.toString("UTF-8");
+        }
+        else {
+            return this.content;
+        }
    }

    /** @returns {Promise&lt;*>} */
    async getJsonContent() {
        const content = await this.getContent();

+        if (!content || !content.trim()) {
+            return null;
+        }
+
        return JSON.parse(content);
    }

@@ -146,9 +152,11 @@ class Note extends Entity {
            throw new Error(`Cannot set null content to note ${this.noteId}`);
        }

+        content = Buffer.isBuffer(content) ? content : Buffer.from(content);
+
        // force updating note itself so that dateModified is represented correctly even for the content
        this.forcedChange = true;
-        this.contentLength = content.length;
+        this.contentLength = content.byteLength;
        await this.save();

        this.content = content;
@@ -157,7 +165,7 @@ class Note extends Entity {
            noteId: this.noteId,
            content: content,
            utcDateModified: dateUtils.utcNowDateTime(),
-            hash: utils.hash(this.noteId + "|" + content)
+            hash: utils.hash(this.noteId + "|" + content.toString())
        };

        if (this.isProtected) {
@@ -831,9 +839,9 @@ class Note extends Entity {
            SELECT * 
            FROM attributes 
            WHERE noteId = ? AND 
-                  isDeleted = 0 AND 
-                  type = 'relation' AND 
-                  name IN ('internalLink', 'imageLink', 'relationMapLink')`, [this.noteId]);
+                  isDeleted = 0 AND
+                  type = 'relation' AND
+                  name IN ('internalLink', 'imageLink', 'relationMapLink', 'includeNoteLink')`, [this.noteId]);
    }

    /**
@@ -982,7 +990,7 @@ module.exports = Note;</code></pre>
 <br class="clear">

 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.3</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.4</a>
 </footer>

 <script> prettyPrint(); </script>
--- a/docs/backend_api/entities_note_revision.js.html
+++ b/docs/backend_api/entities_note_revision.js.html
@@ -76,7 +76,7 @@ class NoteRevision extends Entity {
    }

    async getNote() {
-        return await repository.getEntity("SELECT * FROM notes WHERE noteId = ?", [this.noteId]);
+        return await repository.getNote(this.noteId);
    }

    /** @returns {boolean} true if the note has string content (not binary) */
@@ -117,15 +117,16 @@ class NoteRevision extends Entity {
                    this.content = "";
                }
            }
-
-            if (this.isStringNote()) {
-                this.content = this.content === null
-                    ? ""
-                    : this.content.toString("UTF-8");
-            }
        }

-        return this.content;
+        if (this.isStringNote()) {
+            return this.content === null
+                ? ""
+                : this.content.toString("UTF-8");
+        }
+        else {
+            return this.content;
+        }
    }

    /** @returns {Promise} */
@@ -198,7 +199,7 @@ module.exports = NoteRevision;</code></pre>
 <br class="clear">

 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.3</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.4</a>
 </footer>

 <script> prettyPrint(); </script>
--- a/docs/backend_api/entities_option.js.html
+++ b/docs/backend_api/entities_option.js.html
@@ -82,7 +82,7 @@ module.exports = Option;</code></pre>
 <br class="clear">

 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.3</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.4</a>
 </footer>

 <script> prettyPrint(); </script>
--- a/docs/backend_api/entities_recent_note.js.html
+++ b/docs/backend_api/entities_recent_note.js.html
@@ -75,7 +75,7 @@ module.exports = RecentNote;</code></pre>
 <br class="clear">

 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.3</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.4</a>
 </footer>

 <script> prettyPrint(); </script>
--- a/docs/backend_api/global.html
+++ b/docs/backend_api/global.html
@@ -1089,7 +1089,7 @@
 <br class="clear">

 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.3</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.4</a>
 </footer>

 <script> prettyPrint(); </script>
--- a/docs/backend_api/index.html
+++ b/docs/backend_api/index.html
@@ -56,7 +56,7 @@
 <br class="clear">

 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.3</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.4</a>
 </footer>

 <script> prettyPrint(); </script>
--- a/docs/backend_api/services_backend_script_api.js.html
+++ b/docs/backend_api/services_backend_script_api.js.html
@@ -276,6 +276,7 @@ function BackendScriptApi(currentNote, apiParams) {

    /**
     * @method
+     * @deprecated please use createNote() API method instead
     *
     * @param {string} parentNoteId - create new note under this parent
     * @param {string} title
@@ -414,12 +415,10 @@ function BackendScriptApi(currentNote, apiParams) {
    this.sql = sql;

    /**
-     * Trigger tree refresh in all connected clients. This is required when some tree change happens in
-     * the backend.
-     *
-     * @returns {Promise&lt;void>}
+     * @method
+     * @deprecated - this is now no-op since all the changes should be gracefully handled per widget
     */
-    this.refreshTree = ws.refreshTree;
+    this.refreshTree = () => {};

    /**
     * @return {{syncVersion, appVersion, buildRevision, dbVersion, dataDirectory, buildDate}|*} - object representing basic info about running Trilium version
@@ -444,7 +443,7 @@ module.exports = BackendScriptApi;
 <br class="clear">

 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.3</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.4</a>
 </footer>

 <script> prettyPrint(); </script>
--- a/docs/frontend_api/Branch.html
+++ b/docs/frontend_api/Branch.html
@@ -183,7 +183,65 @@
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="entities_branch.js.html">entities/branch.js</a>, <a href="entities_branch.js.html#line6">line 6</a>
+        <a href="entities_branch.js.html">entities/branch.js</a>, <a href="entities_branch.js.html#line11">line 11</a>
+    </li></ul></dd>
+    
+
+    
+
+    
+
+    
+</dl>
+
+
+
+
+
+
+        
+            
+<h4 class="name" id="isDeleted"><span class="type-signature"></span>isDeleted<span class="type-signature"></span></h4>
+
+
+
+
+
+
+
+
+
+
+<dl class="details">
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+    <dt class="tag-source">Source:</dt>
+    <dd class="tag-source"><ul class="dummy"><li>
+        <a href="entities_branch.js.html">entities/branch.js</a>, <a href="entities_branch.js.html#line23">line 23</a>
    </li></ul></dd>
    

@@ -241,7 +299,7 @@
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="entities_branch.js.html">entities/branch.js</a>, <a href="entities_branch.js.html#line16">line 16</a>
+        <a href="entities_branch.js.html">entities/branch.js</a>, <a href="entities_branch.js.html#line21">line 21</a>
    </li></ul></dd>
    

@@ -299,7 +357,7 @@
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="entities_branch.js.html">entities/branch.js</a>, <a href="entities_branch.js.html#line8">line 8</a>
+        <a href="entities_branch.js.html">entities/branch.js</a>, <a href="entities_branch.js.html#line13">line 13</a>
    </li></ul></dd>
    

@@ -357,7 +415,7 @@
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="entities_branch.js.html">entities/branch.js</a>, <a href="entities_branch.js.html#line12">line 12</a>
+        <a href="entities_branch.js.html">entities/branch.js</a>, <a href="entities_branch.js.html#line17">line 17</a>
    </li></ul></dd>
    

@@ -415,7 +473,7 @@
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="entities_branch.js.html">entities/branch.js</a>, <a href="entities_branch.js.html#line10">line 10</a>
+        <a href="entities_branch.js.html">entities/branch.js</a>, <a href="entities_branch.js.html#line15">line 15</a>
    </li></ul></dd>
    

@@ -473,7 +531,7 @@
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="entities_branch.js.html">entities/branch.js</a>, <a href="entities_branch.js.html#line14">line 14</a>
+        <a href="entities_branch.js.html">entities/branch.js</a>, <a href="entities_branch.js.html#line19">line 19</a>
    </li></ul></dd>
    

@@ -549,7 +607,109 @@
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="entities_branch.js.html">entities/branch.js</a>, <a href="entities_branch.js.html#line20">line 20</a>
+        <a href="entities_branch.js.html">entities/branch.js</a>, <a href="entities_branch.js.html#line27">line 27</a>
+    </li></ul></dd>
+    
+
+    
+
+    
+
+    
+</dl>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+<h5>Returns:</h5>
+
+        
+
+
+<dl>
+    <dt>
+        Type
+    </dt>
+    <dd>
+        
+<span class="param-type"><a href="NoteShort.html">NoteShort</a></span>
+
+
+    </dd>
+</dl>
+
+    
+
+
+
+
+
+        
+            
+
+    
+
+    
+    <h4 class="name" id="getParentNote"><span class="type-signature">(async) </span>getParentNote<span class="signature">()</span><span class="type-signature"> &rarr; {<a href="NoteShort.html">NoteShort</a>}</span></h4>
+    
+
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+<dl class="details">
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+    <dt class="tag-source">Source:</dt>
+    <dd class="tag-source"><ul class="dummy"><li>
+        <a href="entities_branch.js.html">entities/branch.js</a>, <a href="entities_branch.js.html#line32">line 32</a>
    </li></ul></dd>
    

@@ -651,7 +811,7 @@
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="entities_branch.js.html">entities/branch.js</a>, <a href="entities_branch.js.html#line25">line 25</a>
+        <a href="entities_branch.js.html">entities/branch.js</a>, <a href="entities_branch.js.html#line37">line 37</a>
    </li></ul></dd>
    

@@ -719,13 +879,13 @@
 </div>

 <nav>
-    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="Branch.html">Branch</a></li><li><a href="FrontendScriptApi.html">FrontendScriptApi</a></li><li><a href="NoteFull.html">NoteFull</a></li><li><a href="NoteShort.html">NoteShort</a></li></ul><h3><a href="global.html">Global</a></h3>
+    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="Branch.html">Branch</a></li><li><a href="FrontendScriptApi.html">FrontendScriptApi</a></li><li><a href="NoteComplement.html">NoteComplement</a></li><li><a href="NoteShort.html">NoteShort</a></li></ul><h3>Global</h3><ul><li><a href="global.html#decorateWidget">decorateWidget</a></li><li><a href="global.html#doRenderBody">doRenderBody</a></li><li><a href="global.html#widgetCollapsedStateChangedEvent">widgetCollapsedStateChangedEvent</a></li></ul>
 </nav>

 <br class="clear">

 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.3</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.4</a>
 </footer>

 <script> prettyPrint(); </script>
--- a/docs/frontend_api/FrontendScriptApi.html
+++ b/docs/frontend_api/FrontendScriptApi.html
--- a/docs/frontend_api/NoteComplement.html
+++ b/docs/frontend_api/NoteComplement.html
@@ -0,0 +1,522 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <title>JSDoc: Class: NoteComplement</title>
+
+    <script src="scripts/prettify/prettify.js"> </script>
+    <script src="scripts/prettify/lang-css.js"> </script>
+    <!--[if lt IE 9]>
+      <script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+    <![endif]-->
+    <link type="text/css" rel="stylesheet" href="styles/prettify-tomorrow.css">
+    <link type="text/css" rel="stylesheet" href="styles/jsdoc-default.css">
+</head>
+
+<body>
+
+<div id="main">
+
+    <h1 class="page-title">Class: NoteComplement</h1>
+
+    
+
+
+
+
+<section>
+
+<header>
+    
+        <h2><span class="attribs"><span class="type-signature"></span></span>NoteComplement<span class="signature">()</span><span class="type-signature"></span></h2>
+        
+            <div class="class-description">Complements the NoteShort with the main note content and other extra attributes</div>
+        
+    
+</header>
+
+<article>
+    <div class="container-overview">
+    
+        
+
+    
+    <h2>Constructor</h2>
+    
+
+    
+    <h4 class="name" id="NoteComplement"><span class="type-signature"></span>new NoteComplement<span class="signature">()</span><span class="type-signature"></span></h4>
+    
+
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+<dl class="details">
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+    <dt class="tag-source">Source:</dt>
+    <dd class="tag-source"><ul class="dummy"><li>
+        <a href="entities_note_complement.js.html">entities/note_complement.js</a>, <a href="entities_note_complement.js.html#line5">line 5</a>
+    </li></ul></dd>
+    
+
+    
+
+    
+
+    
+</dl>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    
+    </div>
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+        <h3 class="subsection-title">Members</h3>
+
+        
+            
+<h4 class="name" id="content"><span class="type-signature"></span>content<span class="type-signature"></span></h4>
+
+
+
+
+
+
+
+
+
+
+<dl class="details">
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+    <dt class="tag-source">Source:</dt>
+    <dd class="tag-source"><ul class="dummy"><li>
+        <a href="entities_note_complement.js.html">entities/note_complement.js</a>, <a href="entities_note_complement.js.html#line10">line 10</a>
+    </li></ul></dd>
+    
+
+    
+
+    
+
+    
+</dl>
+
+
+
+
+
+
+        
+            
+<h4 class="name" id="dateCreated"><span class="type-signature"></span>dateCreated<span class="type-signature"></span></h4>
+
+
+
+
+
+
+
+
+
+
+<dl class="details">
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+    <dt class="tag-source">Source:</dt>
+    <dd class="tag-source"><ul class="dummy"><li>
+        <a href="entities_note_complement.js.html">entities/note_complement.js</a>, <a href="entities_note_complement.js.html#line13">line 13</a>
+    </li></ul></dd>
+    
+
+    
+
+    
+
+    
+</dl>
+
+
+
+
+
+
+        
+            
+<h4 class="name" id="dateModified"><span class="type-signature"></span>dateModified<span class="type-signature"></span></h4>
+
+
+
+
+
+
+
+
+
+
+<dl class="details">
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+    <dt class="tag-source">Source:</dt>
+    <dd class="tag-source"><ul class="dummy"><li>
+        <a href="entities_note_complement.js.html">entities/note_complement.js</a>, <a href="entities_note_complement.js.html#line16">line 16</a>
+    </li></ul></dd>
+    
+
+    
+
+    
+
+    
+</dl>
+
+
+
+
+
+
+        
+            
+<h4 class="name" id="noteId"><span class="type-signature"></span>noteId<span class="type-signature"></span></h4>
+
+
+
+
+
+
+
+
+
+
+<dl class="details">
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+    <dt class="tag-source">Source:</dt>
+    <dd class="tag-source"><ul class="dummy"><li>
+        <a href="entities_note_complement.js.html">entities/note_complement.js</a>, <a href="entities_note_complement.js.html#line7">line 7</a>
+    </li></ul></dd>
+    
+
+    
+
+    
+
+    
+</dl>
+
+
+
+
+
+
+        
+            
+<h4 class="name" id="utcDateCreated"><span class="type-signature"></span>utcDateCreated<span class="type-signature"></span></h4>
+
+
+
+
+
+
+
+
+
+
+<dl class="details">
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+    <dt class="tag-source">Source:</dt>
+    <dd class="tag-source"><ul class="dummy"><li>
+        <a href="entities_note_complement.js.html">entities/note_complement.js</a>, <a href="entities_note_complement.js.html#line19">line 19</a>
+    </li></ul></dd>
+    
+
+    
+
+    
+
+    
+</dl>
+
+
+
+
+
+
+        
+            
+<h4 class="name" id="utcDateModified"><span class="type-signature"></span>utcDateModified<span class="type-signature"></span></h4>
+
+
+
+
+
+
+
+
+
+
+<dl class="details">
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+    <dt class="tag-source">Source:</dt>
+    <dd class="tag-source"><ul class="dummy"><li>
+        <a href="entities_note_complement.js.html">entities/note_complement.js</a>, <a href="entities_note_complement.js.html#line22">line 22</a>
+    </li></ul></dd>
+    
+
+    
+
+    
+
+    
+</dl>
+
+
+
+
+
+
+        
+    
+
+    
+
+    
+
+    
+</article>
+
+</section>
+
+
+
+
+</div>
+
+<nav>
+    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="Branch.html">Branch</a></li><li><a href="FrontendScriptApi.html">FrontendScriptApi</a></li><li><a href="NoteComplement.html">NoteComplement</a></li><li><a href="NoteShort.html">NoteShort</a></li></ul><h3>Global</h3><ul><li><a href="global.html#decorateWidget">decorateWidget</a></li><li><a href="global.html#doRenderBody">doRenderBody</a></li><li><a href="global.html#widgetCollapsedStateChangedEvent">widgetCollapsedStateChangedEvent</a></li></ul>
+</nav>
+
+<br class="clear">
+
+<footer>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.4</a>
+</footer>
+
+<script> prettyPrint(); </script>
+<script src="scripts/linenumber.js"> </script>
+</body>
+</html>
--- a/docs/frontend_api/NoteShort.html
+++ b/docs/frontend_api/NoteShort.html
--- a/docs/frontend_api/entities_attribute.js.html
+++ b/docs/frontend_api/entities_attribute.js.html
@@ -29,6 +29,11 @@
            <pre class="prettyprint source linenums"><code>class Attribute {
    constructor(treeCache, row) {
        this.treeCache = treeCache;
+
+        this.update(row);
+    }
+
+    update(row) {
        /** @param {string} attributeId */
        this.attributeId = row.attributeId;
        /** @param {string} noteId */
@@ -43,12 +48,6 @@
        this.position = row.position;
        /** @param {boolean} isInheritable */
        this.isInheritable = row.isInheritable;
-        /** @param {boolean} isDeleted */
-        this.isDeleted = row.isDeleted;
-        /** @param {string} utcDateCreated */
-        this.utcDateCreated = row.utcDateCreated;
-        /** @param {string} utcDateModified */
-        this.utcDateModified = row.utcDateModified;
    }

    /** @returns {NoteShort} */
@@ -56,8 +55,17 @@
        return await this.treeCache.getNote(this.noteId);
    }

+    get jsonValue() {
+        try {
+            return JSON.parse(this.value);
+        }
+        catch (e) {
+            return null;
+        }
+    }
+
    get toString() {
-        return `Attribute(attributeId=${this.attributeId}, type=${this.type}, name=${this.name})`;
+        return `Attribute(attributeId=${this.attributeId}, type=${this.type}, name=${this.name}, value=${this.value})`;
    }
 }

@@ -71,13 +79,13 @@ export default Attribute;</code></pre>
 </div>

 <nav>
-    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="Branch.html">Branch</a></li><li><a href="FrontendScriptApi.html">FrontendScriptApi</a></li><li><a href="NoteFull.html">NoteFull</a></li><li><a href="NoteShort.html">NoteShort</a></li></ul><h3><a href="global.html">Global</a></h3>
+    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="Branch.html">Branch</a></li><li><a href="FrontendScriptApi.html">FrontendScriptApi</a></li><li><a href="NoteComplement.html">NoteComplement</a></li><li><a href="NoteShort.html">NoteShort</a></li></ul><h3>Global</h3><ul><li><a href="global.html#decorateWidget">decorateWidget</a></li><li><a href="global.html#doRenderBody">doRenderBody</a></li><li><a href="global.html#widgetCollapsedStateChangedEvent">widgetCollapsedStateChangedEvent</a></li></ul>
 </nav>

 <br class="clear">

 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.3</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.4</a>
 </footer>

 <script> prettyPrint(); </script>
--- a/docs/frontend_api/entities_branch.js.html
+++ b/docs/frontend_api/entities_branch.js.html
@@ -30,6 +30,11 @@
 class Branch {
    constructor(treeCache, row) {
        this.treeCache = treeCache;
+
+        this.update(row);
+    }
+
+    update(row) {
        /** @param {string} primary key */
        this.branchId = row.branchId;
        /** @param {string} */
@@ -42,6 +47,8 @@ class Branch {
        this.prefix = row.prefix;
        /** @param {boolean} */
        this.isExpanded = !!row.isExpanded;
+        /** @param {boolean} */
+        this.isDeleted = !!row.isDeleted;
    }

    /** @returns {NoteShort} */
@@ -49,6 +56,11 @@ class Branch {
        return this.treeCache.getNote(this.noteId);
    }

+    /** @returns {NoteShort} */
+    async getParentNote() {
+        return this.treeCache.getNote(this.parentNoteId);
+    }
+
    /** @returns {boolean} true if it's top level, meaning its parent is root note */
    isTopLevel() {
        return this.parentNoteId === 'root';
@@ -69,13 +81,13 @@ export default Branch;</code></pre>
 </div>

 <nav>
-    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="Branch.html">Branch</a></li><li><a href="FrontendScriptApi.html">FrontendScriptApi</a></li><li><a href="NoteFull.html">NoteFull</a></li><li><a href="NoteShort.html">NoteShort</a></li></ul><h3><a href="global.html">Global</a></h3>
+    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="Branch.html">Branch</a></li><li><a href="FrontendScriptApi.html">FrontendScriptApi</a></li><li><a href="NoteComplement.html">NoteComplement</a></li><li><a href="NoteShort.html">NoteShort</a></li></ul><h3>Global</h3><ul><li><a href="global.html#decorateWidget">decorateWidget</a></li><li><a href="global.html#doRenderBody">doRenderBody</a></li><li><a href="global.html#widgetCollapsedStateChangedEvent">widgetCollapsedStateChangedEvent</a></li></ul>
 </nav>

 <br class="clear">

 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.3</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.4</a>
 </footer>

 <script> prettyPrint(); </script>
--- a/docs/frontend_api/entities_note_complement.js.html
+++ b/docs/frontend_api/entities_note_complement.js.html
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <title>JSDoc: Source: entities/note_complement.js</title>
+
+    <script src="scripts/prettify/prettify.js"> </script>
+    <script src="scripts/prettify/lang-css.js"> </script>
+    <!--[if lt IE 9]>
+      <script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+    <![endif]-->
+    <link type="text/css" rel="stylesheet" href="styles/prettify-tomorrow.css">
+    <link type="text/css" rel="stylesheet" href="styles/jsdoc-default.css">
+</head>
+
+<body>
+
+<div id="main">
+
+    <h1 class="page-title">Source: entities/note_complement.js</h1>
+
+    
+
+
+
+    
+    <section>
+        <article>
+            <pre class="prettyprint source linenums"><code>/**
+ * Complements the NoteShort with the main note content and other extra attributes
+ */
+class NoteComplement {
+    constructor(row) {
+        /** @param {string} */
+        this.noteId = row.noteId;
+
+        /** @param {string} */
+        this.content = row.content;
+
+        /** @param {string} */
+        this.dateCreated = row.dateCreated;
+
+        /** @param {string} */
+        this.dateModified = row.dateModified;
+
+        /** @param {string} */
+        this.utcDateCreated = row.utcDateCreated;
+
+        /** @param {string} */
+        this.utcDateModified = row.utcDateModified;
+    }
+}
+
+export default NoteComplement;</code></pre>
+        </article>
+    </section>
+
+
+
+
+</div>
+
+<nav>
+    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="Branch.html">Branch</a></li><li><a href="FrontendScriptApi.html">FrontendScriptApi</a></li><li><a href="NoteComplement.html">NoteComplement</a></li><li><a href="NoteShort.html">NoteShort</a></li></ul><h3>Global</h3><ul><li><a href="global.html#decorateWidget">decorateWidget</a></li><li><a href="global.html#doRenderBody">doRenderBody</a></li><li><a href="global.html#widgetCollapsedStateChangedEvent">widgetCollapsedStateChangedEvent</a></li></ul>
+</nav>
+
+<br class="clear">
+
+<footer>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.4</a>
+</footer>
+
+<script> prettyPrint(); </script>
+<script src="scripts/linenumber.js"> </script>
+</body>
+</html>
--- a/docs/frontend_api/entities_note_short.js.html
+++ b/docs/frontend_api/entities_note_short.js.html
@@ -41,30 +41,15 @@ class NoteShort {
    /**
     * @param {TreeCache} treeCache
     * @param {Object.&lt;string, Object>} row
-     * @param {Branch[]} branches - all relevant branches, i.e. where this note is either child or parent
     */
-    constructor(treeCache, row, branches) {
+    constructor(treeCache, row) {
        this.treeCache = treeCache;
-        /** @param {string} */
-        this.noteId = row.noteId;
-        /** @param {string} */
-        this.title = row.title;
-        /** @param {int} */
-        this.contentLength = row.contentLength;
-        /** @param {boolean} */
-        this.isProtected = row.isProtected;
-        /** @param {string} one of 'text', 'code', 'file' or 'render' */
-        this.type = row.type;
-        /** @param {string} content-type, e.g. "application/json" */
-        this.mime = row.mime;
-        /** @param {boolean} */
-        this.isDeleted = row.isDeleted;
-        /** @param {boolean} */
-        this.archived = row.archived;
-        /** @param {string} */
-        this.cssClass = row.cssClass;
-        /** @param {string} */
-        this.iconClass = row.iconClass;
+
+        /** @type {string[]} */
+        this.attributes = [];
+
+        /** @type {string[]} */
+        this.targetRelations = [];

        /** @type {string[]} */
        this.parents = [];
@@ -77,19 +62,24 @@ class NoteShort {
        /** @type {Object.&lt;string, string>} */
        this.childToBranch = {};

-        for (const branch of branches) {
-            if (this.noteId === branch.noteId) {
-                this.parents.push(branch.parentNoteId);
-                this.parentToBranch[branch.parentNoteId] = branch.branchId;
-            }
-            else if (this.noteId === branch.parentNoteId) {
-                this.children.push(branch.noteId);
-                this.childToBranch[branch.noteId] = branch.branchId;
-            }
-            else {
-                throw new Error(`Unknown branch ${branch.branchId} for note ${this.noteId}`);
-            }
-        }
+        this.update(row);
+    }
+
+    update(row) {
+        /** @param {string} */
+        this.noteId = row.noteId;
+        /** @param {string} */
+        this.title = row.title;
+        /** @param {int} */
+        this.contentLength = row.contentLength;
+        /** @param {boolean} */
+        this.isProtected = !!row.isProtected;
+        /** @param {string} one of 'text', 'code', 'file' or 'render' */
+        this.type = row.type;
+        /** @param {string} content-type, e.g. "application/json" */
+        this.mime = row.mime;
+        /** @param {boolean} */
+        this.isDeleted = row.isDeleted;
    }

    addParent(parentNoteId, branchId) {
@@ -141,8 +131,13 @@ class NoteShort {
        }
    }

-    /** @returns {Promise&lt;Branch[]>} */
-    async getBranches() {
+    /** @returns {string[]} */
+    getBranchIds() {
+        return Object.values(this.parentToBranch);
+    }
+
+    /** @returns {Branch[]} */
+    getBranches() {
        const branchIds = Object.values(this.parentToBranch);

        return this.treeCache.getBranches(branchIds);
@@ -153,8 +148,8 @@ class NoteShort {
        return this.children.length > 0;
    }

-    /** @returns {Promise&lt;Branch[]>} */
-    async getChildBranches() {
+    /** @returns {Branch[]} */
+    getChildBranches() {
        // don't use Object.values() to guarantee order
        const branchIds = this.children.map(childNoteId => this.childToBranch[childNoteId]);

@@ -166,9 +161,9 @@ class NoteShort {
        return this.parents;
    }

-    /** @returns {Promise&lt;NoteShort[]>} */
-    async getParentNotes() {
-        return await this.treeCache.getNotes(this.parents);
+    /** @returns {NoteShort[]} */
+    getParentNotes() {
+        return this.treeCache.getNotesFromCache(this.parents);
    }

    /** @returns {string[]} */
@@ -184,126 +179,249 @@ class NoteShort {
    /**
     * @param {string} [type] - (optional) attribute type to filter
     * @param {string} [name] - (optional) attribute name to filter
-     * @returns {Promise&lt;Attribute[]>} all note's attributes, including inherited ones
+     * @returns {Attribute[]} all note's attributes, including inherited ones
     */
-    async getAttributes(type, name) {
-        if (!this.__attributeCache) {
-            this.__attributeCache = (await server.get('notes/' + this.noteId + '/attributes'))
-                .map(attrRow => new Attribute(this.treeCache, attrRow));
+    getOwnedAttributes(type, name) {
+        const attrs = this.attributes
+            .map(attributeId => this.treeCache.attributes[attributeId])
+            .filter(attr => !!attr);
+
+        return this.__filterAttrs(attrs, type, name)
+    }
+
+    /**
+     * @param {string} [type] - (optional) attribute type to filter
+     * @param {string} [name] - (optional) attribute name to filter
+     * @returns {Attribute[]} all note's attributes, including inherited ones
+     */
+    getAttributes(type, name) {
+        const ownedAttributes = this.getOwnedAttributes();
+
+        const attrArrs = [
+            ownedAttributes
+        ];
+
+        for (const templateAttr of ownedAttributes.filter(oa => oa.type === 'relation' &amp;&amp; oa.name === 'template')) {
+            const templateNote = this.treeCache.getNoteFromCache(templateAttr.value);
+
+            if (templateNote) {
+                attrArrs.push(templateNote.getAttributes());
+            }
        }

+        if (this.noteId !== 'root') {
+            for (const parentNote of this.getParentNotes()) {
+                // these virtual parent-child relationships are also loaded into frontend tree cache
+                if (parentNote.type !== 'search') {
+                    attrArrs.push(parentNote.getInheritableAttributes());
+                }
+            }
+        }
+
+        const attributes = attrArrs.flat();
+
+        return this.__filterAttrs(attributes, type, name);
+    }
+
+    __filterAttrs(attributes, type, name) {
        if (type &amp;&amp; name) {
-            return this.__attributeCache.filter(attr => attr.type === type &amp;&amp; attr.name === name);
-        }
-        else if (type) {
-            return this.__attributeCache.filter(attr => attr.type === type);
-        }
-        else if (name) {
-            return this.__attributeCache.filter(attr => attr.name === name);
-        }
-        else {
-            return this.__attributeCache.slice();
+            return attributes.filter(attr => attr.type === type &amp;&amp; attr.name === name);
+        } else if (type) {
+            return attributes.filter(attr => attr.type === type);
+        } else if (name) {
+            return attributes.filter(attr => attr.name === name);
+        } else {
+            return attributes;
        }
    }

+    getInheritableAttributes() {
+        const attrs = this.getAttributes();
+
+        return attrs.filter(attr => attr.isInheritable);
+    }
+
    /**
     * @param {string} [name] - label name to filter
-     * @returns {Promise&lt;Attribute[]>} all note's labels (attributes with type label), including inherited ones
+     * @returns {Attribute[]} all note's labels (attributes with type label), including inherited ones
     */
-    async getLabels(name) {
-        return await this.getAttributes(LABEL, name);
+    getOwnedLabels(name) {
+        return this.getOwnedAttributes(LABEL, name);
    }

    /**
     * @param {string} [name] - label name to filter
-     * @returns {Promise&lt;Attribute[]>} all note's label definitions, including inherited ones
+     * @returns {Attribute[]} all note's labels (attributes with type label), including inherited ones
     */
-    async getLabelDefinitions(name) {
-        return await this.getAttributes(LABEL_DEFINITION, name);
+    getLabels(name) {
+        return this.getAttributes(LABEL, name);
+    }
+
+    /**
+     * @param {string} [name] - label name to filter
+     * @returns {Attribute[]} all note's label definitions, including inherited ones
+     */
+    getLabelDefinitions(name) {
+        return this.getAttributes(LABEL_DEFINITION, name);
    }

    /**
     * @param {string} [name] - relation name to filter
-     * @returns {Promise&lt;Attribute[]>} all note's relations (attributes with type relation), including inherited ones
+     * @returns {Attribute[]} all note's relations (attributes with type relation), including inherited ones
     */
-    async getRelations(name) {
-        return await this.getAttributes(RELATION, name);
+    getOwnedRelations(name) {
+        return this.getOwnedAttributes(RELATION, name);
    }

    /**
     * @param {string} [name] - relation name to filter
-     * @returns {Promise&lt;Attribute[]>} all note's relation definitions including inherited ones
+     * @returns {Attribute[]} all note's relations (attributes with type relation), including inherited ones
     */
-    async getRelationDefinitions(name) {
-        return await this.getAttributes(RELATION_DEFINITION, name);
+    getRelations(name) {
+        return this.getAttributes(RELATION, name);
+    }
+
+    /**
+     * @param {string} [name] - relation name to filter
+     * @returns {Attribute[]} all note's relation definitions including inherited ones
+     */
+    getRelationDefinitions(name) {
+        return this.getAttributes(RELATION_DEFINITION, name);
    }

    /**
     * @param {string} type - attribute type (label, relation, etc.)
     * @param {string} name - attribute name
-     * @returns {Promise&lt;boolean>} true if note has an attribute with given type and name (including inherited)
+     * @returns {boolean} true if note has an attribute with given type and name (including inherited)
     */
-    async hasAttribute(type, name) {
-        return !!await this.getAttribute(type, name);
+    hasAttribute(type, name) {
+        return !!this.getAttribute(type, name);
    }

    /**
     * @param {string} type - attribute type (label, relation, etc.)
     * @param {string} name - attribute name
-     * @returns {Promise&lt;Attribute>} attribute of given type and name. If there's more such attributes, first is  returned. Returns null if there's no such attribute belonging to this note.
+     * @returns {boolean} true if note has an attribute with given type and name (including inherited)
     */
-    async getAttribute(type, name) {
-        const attributes = await this.getAttributes();
-
-        return attributes.find(attr => attr.type === type &amp;&amp; attr.name === name);
+    hasOwnedAttribute(type, name) {
+        return !!this.getOwnedAttribute(type, name);
    }

    /**
     * @param {string} type - attribute type (label, relation, etc.)
     * @param {string} name - attribute name
-     * @returns {Promise&lt;string>} attribute value of given type and name or null if no such attribute exists.
+     * @returns {Attribute} attribute of given type and name. If there's more such attributes, first is  returned. Returns null if there's no such attribute belonging to this note.
     */
-    async getAttributeValue(type, name) {
-        const attr = await this.getAttribute(type, name);
+    getOwnedAttribute(type, name) {
+        const attributes = this.getOwnedAttributes(type, name);
+
+        return attributes.length > 0 ? attributes[0] : 0;
+    }
+
+    /**
+     * @param {string} type - attribute type (label, relation, etc.)
+     * @param {string} name - attribute name
+     * @returns {Attribute} attribute of given type and name. If there's more such attributes, first is  returned. Returns null if there's no such attribute belonging to this note.
+     */
+    getAttribute(type, name) {
+        const attributes = this.getAttributes(type, name);
+
+        return attributes.length > 0 ? attributes[0] : 0;
+    }
+
+    /**
+     * @param {string} type - attribute type (label, relation, etc.)
+     * @param {string} name - attribute name
+     * @returns {string} attribute value of given type and name or null if no such attribute exists.
+     */
+    getOwnedAttributeValue(type, name) {
+        const attr = this.getOwnedAttribute(type, name);
+
+        return attr ? attr.value : null;
+    }
+
+    /**
+     * @param {string} type - attribute type (label, relation, etc.)
+     * @param {string} name - attribute name
+     * @returns {string} attribute value of given type and name or null if no such attribute exists.
+     */
+    getAttributeValue(type, name) {
+        const attr = this.getAttribute(type, name);

        return attr ? attr.value : null;
    }

    /**
     * @param {string} name - label name
-     * @returns {Promise&lt;boolean>} true if label exists (including inherited)
+     * @returns {boolean} true if label exists (excluding inherited)
     */
-    async hasLabel(name) { return await this.hasAttribute(LABEL, name); }
-
-    /**
-     * @param {string} name - relation name
-     * @returns {Promise&lt;boolean>} true if relation exists (including inherited)
-     */
-    async hasRelation(name) { return await this.hasAttribute(RELATION, name); }
+    hasOwnedLabel(name) { return this.hasOwnedAttribute(LABEL, name); }

    /**
     * @param {string} name - label name
-     * @returns {Promise&lt;Attribute>} label if it exists, null otherwise
+     * @returns {boolean} true if label exists (including inherited)
     */
-    async getLabel(name) { return await this.getAttribute(LABEL, name); }
+    hasLabel(name) { return this.hasAttribute(LABEL, name); }

    /**
     * @param {string} name - relation name
-     * @returns {Promise&lt;Attribute>} relation if it exists, null otherwise
+     * @returns {boolean} true if relation exists (excluding inherited)
     */
-    async getRelation(name) { return await this.getAttribute(RELATION, name); }
+    hasOwnedRelation(name) { return this.hasOwnedAttribute(RELATION, name); }
+
+    /**
+     * @param {string} name - relation name
+     * @returns {boolean} true if relation exists (including inherited)
+     */
+    hasRelation(name) { return this.hasAttribute(RELATION, name); }

    /**
     * @param {string} name - label name
-     * @returns {Promise&lt;string>} label value if label exists, null otherwise
+     * @returns {Attribute} label if it exists, null otherwise
     */
-    async getLabelValue(name) { return await this.getAttributeValue(LABEL, name); }
+    getOwnedLabel(name) { return this.getOwnedAttribute(LABEL, name); }
+
+    /**
+     * @param {string} name - label name
+     * @returns {Attribute} label if it exists, null otherwise
+     */
+    getLabel(name) { return this.getAttribute(LABEL, name); }

    /**
     * @param {string} name - relation name
-     * @returns {Promise&lt;string>} relation value if relation exists, null otherwise
+     * @returns {Attribute} relation if it exists, null otherwise
     */
-    async getRelationValue(name) { return await this.getAttributeValue(RELATION, name); }
+    getOwnedRelation(name) { return this.getOwnedAttribute(RELATION, name); }
+
+    /**
+     * @param {string} name - relation name
+     * @returns {Attribute} relation if it exists, null otherwise
+     */
+    getRelation(name) { return this.getAttribute(RELATION, name); }
+
+    /**
+     * @param {string} name - label name
+     * @returns {string} label value if label exists, null otherwise
+     */
+    getOwnedLabelValue(name) { return this.getOwnedAttributeValue(LABEL, name); }
+
+    /**
+     * @param {string} name - label name
+     * @returns {string} label value if label exists, null otherwise
+     */
+    getLabelValue(name) { return this.getAttributeValue(LABEL, name); }
+
+    /**
+     * @param {string} name - relation name
+     * @returns {string} relation value if relation exists, null otherwise
+     */
+    getOwnedRelationValue(name) { return this.getOwnedAttributeValue(RELATION, name); }
+
+    /**
+     * @param {string} name - relation name
+     * @returns {string} relation value if relation exists, null otherwise
+     */
+    getRelationValue(name) { return this.getAttributeValue(RELATION, name); }

    /**
     * @param {string} name
@@ -320,7 +438,7 @@ class NoteShort {
     * @returns {Promise&lt;NoteShort[]>}
     */
    async getRelationTargets(name) {
-        const relations = await this.getRelations(name);
+        const relations = this.getRelations(name);
        const targets = [];

        for (const relation of relations) {
@@ -334,18 +452,18 @@ class NoteShort {
     * Clear note's attributes cache to force fresh reload for next attribute request.
     * Cache is note instance scoped.
     */
-    invalidate__attributeCache() {
+    invalidateAttributeCache() {
        this.__attributeCache = null;
    }

    /**
     * Get relations which target this note
     *
-     * @returns {Promise&lt;Attribute[]>}
+     * @returns {Attribute[]}
     */
-    async getTargetRelations() {
-        return (await server.get('notes/' + this.noteId + '/target-relations'))
-            .map(attrRow => new Attribute(this.treeCache, attrRow));
+    getTargetRelations() {
+        return this.targetRelations
+            .map(attributeId => this.treeCache.attributes[attributeId]);
    }

    get toString() {
@@ -355,11 +473,14 @@ class NoteShort {
    get dto() {
        const dto = Object.assign({}, this);
        delete dto.treeCache;
-        delete dto.archived;
-        delete dto.__attributeCache;

        return dto;
    }
+
+    getCssClass() {
+        const labels = this.getLabels('cssClass');
+        return labels.map(l => l.value).join(' ');
+    }
 }

 export default NoteShort;</code></pre>
@@ -372,13 +493,13 @@ export default NoteShort;</code></pre>
 </div>

 <nav>
-    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="Branch.html">Branch</a></li><li><a href="FrontendScriptApi.html">FrontendScriptApi</a></li><li><a href="NoteFull.html">NoteFull</a></li><li><a href="NoteShort.html">NoteShort</a></li></ul><h3><a href="global.html">Global</a></h3>
+    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="Branch.html">Branch</a></li><li><a href="FrontendScriptApi.html">FrontendScriptApi</a></li><li><a href="NoteComplement.html">NoteComplement</a></li><li><a href="NoteShort.html">NoteShort</a></li></ul><h3>Global</h3><ul><li><a href="global.html#decorateWidget">decorateWidget</a></li><li><a href="global.html#doRenderBody">doRenderBody</a></li><li><a href="global.html#widgetCollapsedStateChangedEvent">widgetCollapsedStateChangedEvent</a></li></ul>
 </nav>

 <br class="clear">

 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.3</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.4</a>
 </footer>

 <script> prettyPrint(); </script>
--- a/docs/frontend_api/global.html
+++ b/docs/frontend_api/global.html
@@ -95,6 +95,275 @@

    

+    
+        <h3 class="subsection-title">Methods</h3>
+
+        
+            
+
+    
+
+    
+    <h4 class="name" id="decorateWidget"><span class="type-signature"></span>decorateWidget<span class="signature">()</span><span class="type-signature"></span></h4>
+    
+
+    
+
+
+
+<div class="description">
+    for overriding
+</div>
+
+
+
+
+
+
+
+
+
+
+
+
+
+<dl class="details">
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+    <dt class="tag-source">Source:</dt>
+    <dd class="tag-source"><ul class="dummy"><li>
+        <a href="widgets_collapsible_widget.js.html">widgets/collapsible_widget.js</a>, <a href="widgets_collapsible_widget.js.html#line93">line 93</a>
+    </li></ul></dd>
+    
+
+    
+
+    
+
+    
+</dl>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+        
+            
+
+    
+
+    
+    <h4 class="name" id="doRenderBody"><span class="type-signature">(async) </span>doRenderBody<span class="signature">()</span><span class="type-signature"></span></h4>
+    
+
+    
+
+
+
+<div class="description">
+    for overriding
+</div>
+
+
+
+
+
+
+
+
+
+
+
+
+
+<dl class="details">
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+    <dt class="tag-source">Source:</dt>
+    <dd class="tag-source"><ul class="dummy"><li>
+        <a href="widgets_collapsible_widget.js.html">widgets/collapsible_widget.js</a>, <a href="widgets_collapsible_widget.js.html#line96">line 96</a>
+    </li></ul></dd>
+    
+
+    
+
+    
+
+    
+</dl>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+        
+            
+
+    
+
+    
+    <h4 class="name" id="widgetCollapsedStateChangedEvent"><span class="type-signature"></span>widgetCollapsedStateChangedEvent<span class="signature">()</span><span class="type-signature"></span></h4>
+    
+
+    
+
+
+
+<div class="description">
+    This event is used to synchronize collapsed state of all the tab-cached widgets since they are all rendered
+separately but should behave uniformly for the user.
+</div>
+
+
+
+
+
+
+
+
+
+
+
+
+
+<dl class="details">
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+    <dt class="tag-source">Source:</dt>
+    <dd class="tag-source"><ul class="dummy"><li>
+        <a href="widgets_collapsible_widget.js.html">widgets/collapsible_widget.js</a>, <a href="widgets_collapsible_widget.js.html#line86">line 86</a>
+    </li></ul></dd>
+    
+
+    
+
+    
+
+    
+</dl>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+        
    

    
@@ -303,7 +572,7 @@
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="services_frontend_script_api.js.html">services/frontend_script_api.js</a>, <a href="services_frontend_script_api.js.html#line72">line 72</a>
+        <a href="services_frontend_script_api.js.html">services/frontend_script_api.js</a>, <a href="services_frontend_script_api.js.html#line76">line 76</a>
    </li></ul></dd>
    

@@ -333,13 +602,13 @@
 </div>

 <nav>
-    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="Branch.html">Branch</a></li><li><a href="FrontendScriptApi.html">FrontendScriptApi</a></li><li><a href="NoteFull.html">NoteFull</a></li><li><a href="NoteShort.html">NoteShort</a></li></ul><h3><a href="global.html">Global</a></h3>
+    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="Branch.html">Branch</a></li><li><a href="FrontendScriptApi.html">FrontendScriptApi</a></li><li><a href="NoteComplement.html">NoteComplement</a></li><li><a href="NoteShort.html">NoteShort</a></li></ul><h3>Global</h3><ul><li><a href="global.html#decorateWidget">decorateWidget</a></li><li><a href="global.html#doRenderBody">doRenderBody</a></li><li><a href="global.html#widgetCollapsedStateChangedEvent">widgetCollapsedStateChangedEvent</a></li></ul>
 </nav>

 <br class="clear">

 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.3</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.4</a>
 </footer>

 <script> prettyPrint(); </script>
--- a/docs/frontend_api/index.html
+++ b/docs/frontend_api/index.html
@@ -50,13 +50,13 @@
 </div>

 <nav>
-    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="Branch.html">Branch</a></li><li><a href="FrontendScriptApi.html">FrontendScriptApi</a></li><li><a href="NoteFull.html">NoteFull</a></li><li><a href="NoteShort.html">NoteShort</a></li></ul><h3><a href="global.html">Global</a></h3>
+    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="Branch.html">Branch</a></li><li><a href="FrontendScriptApi.html">FrontendScriptApi</a></li><li><a href="NoteComplement.html">NoteComplement</a></li><li><a href="NoteShort.html">NoteShort</a></li></ul><h3>Global</h3><ul><li><a href="global.html#decorateWidget">decorateWidget</a></li><li><a href="global.html#doRenderBody">doRenderBody</a></li><li><a href="global.html#widgetCollapsedStateChangedEvent">widgetCollapsedStateChangedEvent</a></li></ul>
 </nav>

 <br class="clear">

 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.3</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.4</a>
 </footer>

 <script> prettyPrint(); </script>
--- a/docs/frontend_api/services_frontend_script_api.js.html
+++ b/docs/frontend_api/services_frontend_script_api.js.html
@@ -32,13 +32,16 @@ import utils from './utils.js';
 import toastService from './toast.js';
 import linkService from './link.js';
 import treeCache from './tree_cache.js';
-import noteDetailService from './note_detail.js';
 import noteTooltipService from './note_tooltip.js';
 import protectedSessionService from './protected_session.js';
 import dateNotesService from './date_notes.js';
-import StandardWidget from '../widgets/standard_widget.js';
+import CollapsibleWidget from '../widgets/collapsible_widget.js';
 import ws from "./ws.js";
 import hoistedNoteService from "./hoisted_note.js";
+import appContext from "./app_context.js";
+import TabAwareWidget from "../widgets/tab_aware_widget.js";
+import TabCachingWidget from "../widgets/tab_caching_widget.js";
+import BasicWidget from "../widgets/basic_widget.js";

 /**
 * This is the main frontend API interface for scripts. It's published in the local "api" object.
@@ -46,7 +49,7 @@ import hoistedNoteService from "./hoisted_note.js";
 * @constructor
 * @hideconstructor
 */
-function FrontendScriptApi(startNote, currentNote, originEntity = null, tabContext = null, $container = null) {
+function FrontendScriptApi(startNote, currentNote, originEntity = null, $container = null) {
    const $pluginButtons = $("#plugin-buttons");

    /** @property {jQuery} container of all the rendered script content */
@@ -62,11 +65,17 @@ function FrontendScriptApi(startNote, currentNote, originEntity = null, tabConte
    // to keep consistency with backend API
    this.dayjs = dayjs;

-    /** @property {TabContext|null} - experimental! */
-    this.tabContext = tabContext;
+    /** @property {CollapsibleWidget} */
+    this.CollapsibleWidget = CollapsibleWidget;

-    /** @property {StandardWidget} */
-    this.StandardWidget = StandardWidget;
+    /** @property {TabAwareWidget} */
+    this.TabAwareWidget = TabAwareWidget;
+
+    /** @property {TabCachingWidget} */
+    this.TabCachingWidget = TabCachingWidget;
+
+    /** @property {BasicWidget} */
+    this.BasicWidget = BasicWidget;

    /**
     * Activates note in the tree and in the note detail.
@@ -75,14 +84,8 @@ function FrontendScriptApi(startNote, currentNote, originEntity = null, tabConte
     * @param {string} notePath (or noteId)
     * @returns {Promise&lt;void>}
     */
-    this.activateNote = async (notePath, noteLoadedListener) => {
-        await treeService.activateNote(notePath, async () => {
-            await treeService.scrollToActiveNote();
-
-            if (noteLoadedListener) {
-                noteLoadedListener();
-            }
-        });
+    this.activateNote = async notePath => {
+        await appContext.tabManager.getActiveTabContext().setNote(notePath);
    };

    /**
@@ -94,7 +97,8 @@ function FrontendScriptApi(startNote, currentNote, originEntity = null, tabConte
    this.activateNewNote = async notePath => {
        await ws.waitForMaxKnownSyncId();

-        await treeService.activateNote(notePath, noteDetailService.focusAndSelectTitle);
+        await appContext.tabManager.getActiveTabContext().setNote(notePath);
+        appContext.triggerEvent('focusAndSelectTitle');
    };

    /**
@@ -172,9 +176,7 @@ function FrontendScriptApi(startNote, currentNote, originEntity = null, tabConte
            currentNoteId: currentNote.noteId,
            originEntityName: "notes", // currently there's no other entity on frontend which can trigger event
            originEntityId: originEntity ? originEntity.noteId : null
-        }, {
-            'trilium-source-id': "script"
-        });
+        }, "script");

        if (ret.success) {
            // wait until all the changes done in the script has been synced to frontend before continuing
@@ -292,28 +294,10 @@ function FrontendScriptApi(startNote, currentNote, originEntity = null, tabConte
    this.showError = toastService.showError;

    /**
-     * Refresh tree
-     *
     * @method
-     * @returns {Promise&lt;void>}
+     * @deprecated - this is now no-op since all the changes should be gracefully handled per widget
     */
-    this.refreshTree = treeService.reload;
-
-    /**
-     * Refresh active tab
-     *
-     * @method
-     * @returns {Promise&lt;void>}
-     */
-    this.refreshActiveTab = noteDetailService.reload;
-
-    /**
-     * Refresh current tab
-     *
-     * @method
-     * @returns {Promise&lt;void>}
-     */
-    this.refreshAllTabs = noteDetailService.reloadAllTabs;
+    this.refreshTree = () => {};

    /**
     * Create note link (jQuery object) for given note.
@@ -327,49 +311,30 @@ function FrontendScriptApi(startNote, currentNote, originEntity = null, tabConte
    /**
     * Adds given text to the editor cursor
     *
-     * @param {string} text
+     * @param {string} text - this must be clear text, HTML is not supported.
     * @method
     */
-    this.addTextToActiveTabEditor = linkService.addTextToEditor;
+    this.addTextToActiveTabEditor = text => appContext.triggerCommand('addTextToActiveEditor', {text});

    /**
     * @method
-     * @returns {NoteFull} active note (loaded into right pane)
+     * @returns {NoteShort} active note (loaded into right pane)
     */
-    this.getActiveTabNote = noteDetailService.getActiveTabNote;
+    this.getActiveTabNote = () => appContext.tabManager.getActiveTabNote();

    /**
     * See https://ckeditor.com/docs/ckeditor5/latest/api/module_core_editor_editor-Editor.html for a documentation on the returned instance.
     *
     * @method
-     * @returns {Editor|null} CKEditor instance or null (e.g. if active note is not a text note)
+     * @param callback - method receiving "textEditor" instance
     */
-    this.getActiveTabTextEditor = noteDetailService.getActiveEditor;
+    this.getActiveTabTextEditor = callback => appContext.triggerCommand('executeInActiveEditor', {callback});

    /**
     * @method
     * @returns {Promise&lt;string|null>} returns note path of active note or null if there isn't active note
     */
-    this.getActiveTabNotePath = noteDetailService.getActiveTabNotePath;
-
-    /**
-     * This method checks whether user navigated away from the note from which the scripts has been started.
-     * This is necessary because script execution is async and by the time it is finished, the user might have
-     * already navigated away from this page - the end result would be that script might return data for the wrong
-     * note.
-     *
-     * @method
-     * @return {boolean} returns true if the original note is still loaded, false if user switched to another
-     */
-    this.isNoteStillActive = () => {
-        return tabContext.note &amp;&amp; this.originEntity.noteId === tabContext.note.noteId;
-    };
-
-    /**
-     * @method
-     * @param {function} func - callback called on note change as user is typing (not necessarily tied to save event)
-     */
-    this.onNoteChange = noteDetailService.onNoteChange;
+    this.getActiveTabNotePath = () => appContext.tabManager.getActiveTabNotePath();

    /**
     * @method
@@ -378,9 +343,32 @@ function FrontendScriptApi(startNote, currentNote, originEntity = null, tabConte
    this.setupElementTooltip = noteTooltipService.setupElementTooltip;

    /**
+     * @deprecated use protectNote and protectSubtree instead
     * @method
     */
-    this.protectActiveNote = protectedSessionService.protectNoteAndSendToServer;
+    this.protectActiveNote = async () => {
+        const activeNote = appContext.tabManager.getActiveTabNote();
+
+        await protectedSessionService.protectNote(activeNote.noteId, true, false);
+    };
+
+    /**
+     * @method
+     * @param {string} noteId
+     * @param {boolean} protect - true to protect note, false to unprotect
+     */
+    this.protectNote = async (noteId, protect) => {
+        await protectedSessionService.protectNote(noteId, protect, false);
+    };
+
+    /**
+     * @method
+     * @param {string} noteId
+     * @param {boolean} protect - true to protect subtree, false to unprotect
+     */
+    this.protectSubTree = async (noteId, protect) => {
+        await protectedSessionService.protectNote(noteId, protect, true);
+    };

    /**
     * Returns date-note for today. If it doesn't exist, it is automatically created.
@@ -455,13 +443,13 @@ export default FrontendScriptApi;</code></pre>
 </div>

 <nav>
-    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="Branch.html">Branch</a></li><li><a href="FrontendScriptApi.html">FrontendScriptApi</a></li><li><a href="NoteFull.html">NoteFull</a></li><li><a href="NoteShort.html">NoteShort</a></li></ul><h3><a href="global.html">Global</a></h3>
+    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="Branch.html">Branch</a></li><li><a href="FrontendScriptApi.html">FrontendScriptApi</a></li><li><a href="NoteComplement.html">NoteComplement</a></li><li><a href="NoteShort.html">NoteShort</a></li></ul><h3>Global</h3><ul><li><a href="global.html#decorateWidget">decorateWidget</a></li><li><a href="global.html#doRenderBody">doRenderBody</a></li><li><a href="global.html#widgetCollapsedStateChangedEvent">widgetCollapsedStateChangedEvent</a></li></ul>
 </nav>

 <br class="clear">

 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.3</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.4</a>
 </footer>

 <script> prettyPrint(); </script>
--- a/docs/frontend_api/widgets_collapsible_widget.js.html
+++ b/docs/frontend_api/widgets_collapsible_widget.js.html
@@ -0,0 +1,151 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <title>JSDoc: Source: widgets/collapsible_widget.js</title>
+
+    <script src="scripts/prettify/prettify.js"> </script>
+    <script src="scripts/prettify/lang-css.js"> </script>
+    <!--[if lt IE 9]>
+      <script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+    <![endif]-->
+    <link type="text/css" rel="stylesheet" href="styles/prettify-tomorrow.css">
+    <link type="text/css" rel="stylesheet" href="styles/jsdoc-default.css">
+</head>
+
+<body>
+
+<div id="main">
+
+    <h1 class="page-title">Source: widgets/collapsible_widget.js</h1>
+
+    
+
+
+
+    
+    <section>
+        <article>
+            <pre class="prettyprint source linenums"><code>import TabAwareWidget from "./tab_aware_widget.js";
+import options from "../services/options.js";
+
+const WIDGET_TPL = `
+&lt;div class="card widget">
+    &lt;div class="card-header">
+        &lt;div>           
+            &lt;button class="btn btn-sm widget-title" data-toggle="collapse" data-target="#[to be set]">
+                Collapsible Group Item
+            &lt;/button>
+            
+            &lt;a class="widget-help external no-arrow bx bx-info-circle">&lt;/a>
+        &lt;/div>
+        
+        &lt;div class="widget-header-actions">&lt;/div>
+    &lt;/div>
+
+    &lt;div id="[to be set]" class="collapse body-wrapper" style="transition: none; ">
+        &lt;div class="card-body">&lt;/div>
+    &lt;/div>
+&lt;/div>`;
+
+export default class CollapsibleWidget extends TabAwareWidget {
+    get widgetTitle() { return "Untitled widget"; }
+
+    get headerActions() { return []; }
+
+    get help() { return {}; }
+
+    doRender() {
+        this.$widget = $(WIDGET_TPL);
+        this.$widget.find('[data-target]').attr('data-target', "#" + this.componentId);
+
+        this.$bodyWrapper = this.$widget.find('.body-wrapper');
+        this.$bodyWrapper.attr('id', this.componentId); // for toggle to work we need id
+
+        this.widgetName = this.constructor.name;
+
+        if (!options.is(this.widgetName + 'Collapsed')) {
+            this.$bodyWrapper.collapse("show");
+        }
+
+        // using immediate variants of the event so that the previous collapse is not caught
+        this.$bodyWrapper.on('hide.bs.collapse', () => this.saveCollapsed(true));
+        this.$bodyWrapper.on('show.bs.collapse', () => this.saveCollapsed(false));
+
+        this.$body = this.$bodyWrapper.find('.card-body');
+
+        this.$title = this.$widget.find('.widget-title');
+        this.$title.text(this.widgetTitle);
+
+        this.$help = this.$widget.find('.widget-help');
+
+        if (this.help.title) {
+            this.$help.attr("title", this.help.title);
+            this.$help.attr("href", this.help.url || "javascript:");
+
+            if (!this.help.url) {
+                this.$help.addClass('no-link');
+            }
+        }
+        else {
+            this.$help.hide();
+        }
+
+        this.$headerActions = this.$widget.find('.widget-header-actions');
+        this.$headerActions.append(...this.headerActions);
+
+        this.initialized = this.doRenderBody();
+
+        this.decorateWidget();
+
+        return this.$widget;
+    }
+
+    saveCollapsed(collapse) {
+        options.save(this.widgetName + 'Collapsed', collapse.toString());
+
+        this.triggerEvent(`widgetCollapsedStateChanged`, {widgetName: this.widgetName, collapse});
+    }
+
+    /**
+     * This event is used to synchronize collapsed state of all the tab-cached widgets since they are all rendered
+     * separately but should behave uniformly for the user.
+     */
+    widgetCollapsedStateChangedEvent({widgetName, collapse}) {
+        if (widgetName === this.widgetName) {
+            this.$bodyWrapper.toggleClass('show', !collapse);
+        }
+    }
+
+    /** for overriding */
+    decorateWidget() {}
+
+    /** for overriding */
+    async doRenderBody() {}
+
+    isExpanded() {
+        return this.$bodyWrapper.hasClass("show");
+    }
+}</code></pre>
+        </article>
+    </section>
+
+
+
+
+</div>
+
+<nav>
+    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="Branch.html">Branch</a></li><li><a href="FrontendScriptApi.html">FrontendScriptApi</a></li><li><a href="NoteComplement.html">NoteComplement</a></li><li><a href="NoteShort.html">NoteShort</a></li></ul><h3>Global</h3><ul><li><a href="global.html#decorateWidget">decorateWidget</a></li><li><a href="global.html#doRenderBody">doRenderBody</a></li><li><a href="global.html#widgetCollapsedStateChangedEvent">widgetCollapsedStateChangedEvent</a></li></ul>
+</nav>
+
+<br class="clear">
+
+<footer>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.4</a>
+</footer>
+
+<script> prettyPrint(); </script>
+<script src="scripts/linenumber.js"> </script>
+</body>
+</html>
--- a/electron.js
+++ b/electron.js
@@ -24,8 +24,6 @@ app.on('window-all-closed', () => {
 app.on('ready', async () => {
    app.setAppUserModelId('com.github.zadam.trilium');

-    await sqlInit.dbConnection;
-
    // if db is not initialized -> setup process
    // if db is initialized, then we need to wait until the migration process is finished
    if (await sqlInit.isDbInitialized()) {
@@ -44,4 +42,7 @@ app.on('will-quit', () => {
    globalShortcut.unregisterAll();
 });

+// this is to disable electron warning spam in the dev console (local development only)
+process.env['ELECTRON_DISABLE_SECURITY_WARNINGS'] = 'true';
+
 require('./src/www');
--- a/issue_template.md
+++ b/issue_template.md
@@ -1,4 +1,4 @@
-For bug reports, please mention **version of the application** and include **log files** from following location:
+For bug reports, **PLEASE mention version of Trilium you're using** and also include **log files** from following location:

 * `/home/[user]/.local/share/trilium-data/log` for Linux
 * `C:\Users\[user]\AppData\Roaming\trilium-data\log` for Windows Vista and up
--- a/libraries/autocomplete.jquery.min.js
+++ b/libraries/autocomplete.jquery.min.js
--- a/libraries/bootstrap/css/bootstrap.min.css
+++ b/libraries/bootstrap/css/bootstrap.min.css
--- a/libraries/bootstrap/css/bootstrap.min.css.map
+++ b/libraries/bootstrap/css/bootstrap.min.css.map
--- a/libraries/bootstrap/js/bootstrap.bundle.min.js
+++ b/libraries/bootstrap/js/bootstrap.bundle.min.js
--- a/libraries/bootstrap/js/bootstrap.bundle.min.js.map
+++ b/libraries/bootstrap/js/bootstrap.bundle.min.js.map
--- a/libraries/boxicons/css/boxicons.css
+++ b/libraries/boxicons/css/boxicons.css
--- a/libraries/boxicons/css/boxicons.min.css
+++ b/libraries/boxicons/css/boxicons.min.css
--- a/libraries/boxicons/fonts/boxicons.eot
+++ b/libraries/boxicons/fonts/boxicons.eot
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				`DELETE FROM options WHERE name = 'keyboardShortcutsActivateParentNote';`