release 0.44.0-beta

remove test as build step
release 0.44.0-bet
2025-10-26 15:56:29 +01:00 · 2020-09-03 23:26:51 +02:00 · 2020-09-03 23:26:36 +02:00 · 2020-09-03 23:25:23 +02:00 · 2020-09-03 22:37:51 +02:00 · 2020-09-03 22:22:21 +02:00
553 changed files with 53826 additions and 29437 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/.gitignore
+++ b/.idea/.gitignore
@@ -2,4 +2,5 @@
 /workspace.xml
 # Datasource local storage ignored files
-/dataSources.local.xml
+/dataSources.local.xml
 /dataSources/
--- a/.idea/dataSources.xml
+++ b/.idea/dataSources.xml
@@ -1,14 +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>
      <driver-properties>
        <property name="enable_load_extension" value="true" />
      </driver-properties>
    </data-source>
  </component>
 </project>
--- a/.idea/dataSources/a2c75661-f9e2-478f-a69f-6a9409e69997.xml
+++ b/.idea/dataSources/a2c75661-f9e2-478f-a69f-6a9409e69997.xml
@@ -1,590 +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.16">
    <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="event_log"/>
    <table id="10" parent="2" name="note_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="hash">
      <Position>10</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
      <DefaultExpression>&quot;&quot;</DefaultExpression>
    </column>
    <column id="36" parent="7" name="isInheritable">
      <Position>11</Position>
      <DataType>int|0s</DataType>
      <DefaultExpression>0</DefaultExpression>
    </column>
    <index id="37" parent="7" name="sqlite_autoindex_attributes_1">
      <NameSurrogate>1</NameSurrogate>
      <ColNames>attributeId</ColNames>
      <Unique>1</Unique>
    </index>
    <index id="38" parent="7" name="IDX_attributes_noteId_index">
      <ColNames>noteId</ColNames>
    </index>
    <index id="39" parent="7" name="IDX_attributes_name_value">
      <ColNames>name
 value</ColNames>
    </index>
    <index id="40" parent="7" name="IDX_attributes_name_index">
      <ColNames>name</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>BOOLEAN|0s</DataType>
    </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="utcDateModified">
      <Position>8</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
    </column>
    <column id="51" parent="8" name="utcDateCreated">
      <Position>9</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
    </column>
    <column id="52" parent="8" name="hash">
      <Position>10</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
      <DefaultExpression>&quot;&quot;</DefaultExpression>
    </column>
    <index id="53" parent="8" name="sqlite_autoindex_branches_1">
      <NameSurrogate>1</NameSurrogate>
      <ColNames>branchId</ColNames>
      <Unique>1</Unique>
    </index>
    <index id="54" parent="8" name="IDX_branches_noteId_parentNoteId">
      <ColNames>noteId
 parentNoteId</ColNames>
    </index>
    <index id="55" parent="8" name="IDX_branches_noteId">
      <ColNames>noteId</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="eventId">
      <Position>1</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
    </column>
    <column id="59" parent="9" name="noteId">
      <Position>2</Position>
      <DataType>TEXT|0s</DataType>
    </column>
    <column id="60" parent="9" name="comment">
      <Position>3</Position>
      <DataType>TEXT|0s</DataType>
    </column>
    <column id="61" parent="9" name="utcDateCreated">
      <Position>4</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
    </column>
    <index id="62" parent="9" name="sqlite_autoindex_event_log_1">
      <NameSurrogate>1</NameSurrogate>
      <ColNames>eventId</ColNames>
      <Unique>1</Unique>
    </index>
    <key id="63" parent="9">
      <ColNames>eventId</ColNames>
      <Primary>1</Primary>
      <UnderlyingIndexName>sqlite_autoindex_event_log_1</UnderlyingIndexName>
    </key>
    <column id="64" parent="10" name="noteId">
      <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>
      <DefaultExpression>NULL</DefaultExpression>
    </column>
    <column id="66" parent="10" name="hash">
      <Position>3</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
      <DefaultExpression>&quot;&quot;</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_contents_1">
      <NameSurrogate>1</NameSurrogate>
      <ColNames>noteId</ColNames>
      <Unique>1</Unique>
    </index>
    <key id="69" parent="10">
      <ColNames>noteId</ColNames>
      <Primary>1</Primary>
      <UnderlyingIndexName>sqlite_autoindex_note_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="content">
      <Position>4</Position>
      <DataType>TEXT|0s</DataType>
    </column>
    <column id="74" parent="11" name="isProtected">
      <Position>5</Position>
      <DataType>INT|0s</DataType>
      <NotNull>1</NotNull>
      <DefaultExpression>0</DefaultExpression>
    </column>
    <column id="75" parent="11" name="utcDateModifiedFrom">
      <Position>6</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
    </column>
    <column id="76" parent="11" name="utcDateModifiedTo">
      <Position>7</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
    </column>
    <column id="77" parent="11" name="dateModifiedFrom">
      <Position>8</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
    </column>
    <column id="78" parent="11" name="dateModifiedTo">
      <Position>9</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
    </column>
    <column id="79" parent="11" name="type">
      <Position>10</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
      <DefaultExpression>&apos;&apos;</DefaultExpression>
    </column>
    <column id="80" parent="11" name="mime">
      <Position>11</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
      <DefaultExpression>&apos;&apos;</DefaultExpression>
    </column>
    <column id="81" parent="11" name="hash">
      <Position>12</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
      <DefaultExpression>&quot;&quot;</DefaultExpression>
    </column>
    <index id="82" parent="11" name="sqlite_autoindex_note_revisions_1">
      <NameSurrogate>1</NameSurrogate>
      <ColNames>noteRevisionId</ColNames>
      <Unique>1</Unique>
    </index>
    <index id="83" parent="11" name="IDX_note_revisions_noteId">
      <ColNames>noteId</ColNames>
    </index>
    <index id="84" parent="11" name="IDX_note_revisions_dateModifiedFrom">
      <ColNames>utcDateModifiedFrom</ColNames>
    </index>
    <index id="85" parent="11" name="IDX_note_revisions_dateModifiedTo">
      <ColNames>utcDateModifiedTo</ColNames>
    </index>
    <key id="86" parent="11">
      <ColNames>noteRevisionId</ColNames>
      <Primary>1</Primary>
      <UnderlyingIndexName>sqlite_autoindex_note_revisions_1</UnderlyingIndexName>
    </key>
    <column id="87" parent="12" name="noteId">
      <Position>1</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
    </column>
    <column id="88" parent="12" name="title">
      <Position>2</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
      <DefaultExpression>&quot;note&quot;</DefaultExpression>
    </column>
    <column id="89" parent="12" name="isProtected">
      <Position>3</Position>
      <DataType>INT|0s</DataType>
      <NotNull>1</NotNull>
      <DefaultExpression>0</DefaultExpression>
    </column>
    <column id="90" parent="12" name="type">
      <Position>4</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
      <DefaultExpression>&apos;text&apos;</DefaultExpression>
    </column>
    <column id="91" parent="12" name="mime">
      <Position>5</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
      <DefaultExpression>&apos;text/html&apos;</DefaultExpression>
    </column>
    <column id="92" parent="12" name="hash">
      <Position>6</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
      <DefaultExpression>&quot;&quot;</DefaultExpression>
    </column>
    <column id="93" parent="12" name="isDeleted">
      <Position>7</Position>
      <DataType>INT|0s</DataType>
      <NotNull>1</NotNull>
      <DefaultExpression>0</DefaultExpression>
    </column>
    <column id="94" parent="12" name="dateCreated">
      <Position>8</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
    </column>
    <column id="95" parent="12" name="dateModified">
      <Position>9</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
    </column>
    <column id="96" parent="12" name="utcDateCreated">
      <Position>10</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
    </column>
    <column id="97" parent="12" name="utcDateModified">
      <Position>11</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
    </column>
    <index id="98" parent="12" name="sqlite_autoindex_notes_1">
      <NameSurrogate>1</NameSurrogate>
      <ColNames>noteId</ColNames>
      <Unique>1</Unique>
    </index>
    <key id="99" parent="12">
      <ColNames>noteId</ColNames>
      <Primary>1</Primary>
      <UnderlyingIndexName>sqlite_autoindex_notes_1</UnderlyingIndexName>
    </key>
    <column id="100" parent="13" name="name">
      <Position>1</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
    </column>
    <column id="101" parent="13" name="value">
      <Position>2</Position>
      <DataType>TEXT|0s</DataType>
    </column>
    <column id="102" parent="13" name="isSynced">
      <Position>3</Position>
      <DataType>INTEGER|0s</DataType>
      <NotNull>1</NotNull>
      <DefaultExpression>0</DefaultExpression>
    </column>
    <column id="103" parent="13" name="hash">
      <Position>4</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
      <DefaultExpression>&quot;&quot;</DefaultExpression>
    </column>
    <column id="104" parent="13" name="utcDateCreated">
      <Position>5</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
    </column>
    <column id="105" parent="13" name="utcDateModified">
      <Position>6</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
    </column>
    <index id="106" parent="13" name="sqlite_autoindex_options_1">
      <NameSurrogate>1</NameSurrogate>
      <ColNames>name</ColNames>
      <Unique>1</Unique>
    </index>
    <key id="107" parent="13">
      <ColNames>name</ColNames>
      <Primary>1</Primary>
      <UnderlyingIndexName>sqlite_autoindex_options_1</UnderlyingIndexName>
    </key>
    <column id="108" parent="14" name="noteId">
      <Position>1</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
    </column>
    <column id="109" parent="14" name="notePath">
      <Position>2</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
    </column>
    <column id="110" parent="14" name="hash">
      <Position>3</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
      <DefaultExpression>&quot;&quot;</DefaultExpression>
    </column>
    <column id="111" parent="14" name="utcDateCreated">
      <Position>4</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
    </column>
    <column id="112" parent="14" name="isDeleted">
      <Position>5</Position>
      <DataType>INT|0s</DataType>
    </column>
    <index id="113" parent="14" name="sqlite_autoindex_recent_notes_1">
      <NameSurrogate>1</NameSurrogate>
      <ColNames>noteId</ColNames>
      <Unique>1</Unique>
    </index>
    <key id="114" parent="14">
      <ColNames>noteId</ColNames>
      <Primary>1</Primary>
      <UnderlyingIndexName>sqlite_autoindex_recent_notes_1</UnderlyingIndexName>
    </key>
    <column id="115" parent="15" name="sourceId">
      <Position>1</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
    </column>
    <column id="116" parent="15" name="utcDateCreated">
      <Position>2</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
    </column>
    <index id="117" parent="15" name="sqlite_autoindex_source_ids_1">
      <NameSurrogate>1</NameSurrogate>
      <ColNames>sourceId</ColNames>
      <Unique>1</Unique>
    </index>
    <key id="118" parent="15">
      <ColNames>sourceId</ColNames>
      <Primary>1</Primary>
      <UnderlyingIndexName>sqlite_autoindex_source_ids_1</UnderlyingIndexName>
    </key>
    <column id="119" parent="16" name="type">
      <Position>1</Position>
      <DataType>text|0s</DataType>
    </column>
    <column id="120" parent="16" name="name">
      <Position>2</Position>
      <DataType>text|0s</DataType>
    </column>
    <column id="121" parent="16" name="tbl_name">
      <Position>3</Position>
      <DataType>text|0s</DataType>
    </column>
    <column id="122" parent="16" name="rootpage">
      <Position>4</Position>
      <DataType>int|0s</DataType>
    </column>
    <column id="123" parent="16" name="sql">
      <Position>5</Position>
      <DataType>text|0s</DataType>
    </column>
    <column id="124" parent="17" name="name">
      <Position>1</Position>
    </column>
    <column id="125" parent="17" name="seq">
      <Position>2</Position>
    </column>
    <column id="126" parent="18" name="id">
      <Position>1</Position>
      <DataType>INTEGER|0s</DataType>
      <NotNull>1</NotNull>
      <SequenceIdentity>1</SequenceIdentity>
    </column>
    <column id="127" parent="18" name="entityName">
      <Position>2</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
    </column>
    <column id="128" parent="18" name="entityId">
      <Position>3</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
    </column>
    <column id="129" parent="18" name="sourceId">
      <Position>4</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
    </column>
    <column id="130" parent="18" name="utcSyncDate">
      <Position>5</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
    </column>
    <index id="131" parent="18" name="IDX_sync_entityName_entityId">
      <ColNames>entityName
 entityId</ColNames>
      <Unique>1</Unique>
    </index>
    <index id="132" parent="18" name="IDX_sync_utcSyncDate">
      <ColNames>utcSyncDate</ColNames>
    </index>
    <key id="133" 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.13.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/*
+cp -r bin/better-sqlite3/linux-desktop-better_sqlite3.node $SRC_DIR/node_modules/better-sqlite3/build/Release/better_sqlite3.node
 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/
 ./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/*
+cp -r bin/better-sqlite3/mac-better_sqlite3.node $SRC_DIR/node_modules/better-sqlite3/build/Release/better_sqlite3.node
 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/deps/mac-x64/sqlite/* $SRC_DIR/node_modules/sqlite3/lib/binding/
+rm -r $SRC_DIR/src/public/app-dist/*.mobile.*
 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/
 ./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.13.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/better-sqlite3/linux-server-better_sqlite3.node $PKG_DIR/node_modules/better-sqlite3/build/Release/better_sqlite3.node
 cp -r ./bin/deps/linux-x64/sqlite/node* $PKG_DIR/node_modules/sqlite3/lib/binding/
 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/*
+cp -r bin/better-sqlite3/win-better_sqlite3.node $SRC_DIR/node_modules/better-sqlite3/build/Release/better_sqlite3.node
 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/deps/win-x64/sqlite/* $SRC_DIR/node_modules/sqlite3/lib/binding/
+rm -r $SRC_DIR/src/public/app-dist/*.mobile.*
 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/
 ./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,10 +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/0150__note_revision_contents.sql
+++ b/db/migrations/0150__note_revision_contents.sql
@@ -0,0 +1,36 @@
 CREATE TABLE IF NOT EXISTS "note_revisions_mig" (`noteRevisionId`	TEXT NOT NULL PRIMARY KEY,
                                                `noteId`	TEXT NOT NULL,
                                                `title`	TEXT,
                                                `contentLength`	INT NOT NULL,
                                                `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 TABLE IF NOT EXISTS "note_revision_contents" (`noteRevisionId`	TEXT NOT NULL PRIMARY KEY,
                                                 `content`	TEXT,
                                                 hash TEXT DEFAULT '' NOT NULL,
                                                 `utcDateModified` TEXT NOT NULL);
 INSERT INTO note_revision_contents (noteRevisionId, content, hash, utcDateModified)
 SELECT noteRevisionId, content, hash, utcDateModifiedTo FROM note_revisions;
 INSERT INTO note_revisions_mig (noteRevisionId, noteId, title, contentLength, isProtected, utcDateLastEdited, utcDateCreated, utcDateModified, dateLastEdited, dateCreated, type, mime, hash)
 SELECT noteRevisionId, noteId, title, COALESCE(LENGTH(content), 0), isProtected, utcDateModifiedFrom, utcDateModifiedTo, utcDateModifiedTo, dateModifiedFrom, dateModifiedTo, 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`);
 INSERT INTO sync (entityName, entityId, sourceId, utcSyncDate)
 SELECT 'note_revision_contents', entityId, sourceId, utcSyncDate FROM sync WHERE entityName = 'note_revisions';
--- a/db/migrations/0151__add_isErased_to_note.sql
+++ b/db/migrations/0151__add_isErased_to_note.sql
@@ -0,0 +1,31 @@
 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,
                                       `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, isErased, dateCreated, dateModified, utcDateCreated, utcDateModified)
 SELECT noteId, title, isProtected, type, mime, hash, isDeleted, 0, dateCreated, dateModified, utcDateCreated, utcDateModified FROM notes;
 DROP TABLE notes;
 ALTER TABLE notes_mig RENAME TO notes;
 UPDATE notes SET isErased = 1 WHERE isDeleted = 1
 AND 1=(SELECT CASE WHEN content IS NULL THEN 1 ELSE 0 END FROM note_contents WHERE note_contents.noteId = notes.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`);
--- a/db/migrations/0152__add_contentLength_to_note.sql
+++ b/db/migrations/0152__add_contentLength_to_note.sql
@@ -0,0 +1,34 @@
 CREATE TABLE IF NOT EXISTS "notes_mig" (
                                           `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,
                                           `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, contentLength, isProtected, type, mime, hash, isDeleted, isErased, dateCreated, dateModified, utcDateCreated, utcDateModified)
 SELECT noteId, title, -1, isProtected, type, mime, hash, isDeleted, isErased, dateCreated, dateModified, utcDateCreated, utcDateModified FROM notes;
 DROP TABLE notes;
 ALTER TABLE notes_mig RENAME TO notes;
 UPDATE notes SET contentLength = COALESCE((SELECT COALESCE(LENGTH(content), 0) FROM note_contents WHERE note_contents.noteId = notes.noteId), -1);
 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`);
 -- should be OK since sync protocol changes so all instances must upgrade
 UPDATE attributes SET isDeleted = 1 WHERE name = 'fileSize';
--- a/db/migrations/0153__add_isErased_to_note_revision.sql
+++ b/db/migrations/0153__add_isErased_to_note_revision.sql
@@ -0,0 +1,28 @@
 CREATE TABLE IF NOT EXISTS "note_revisions_mig" (`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);
 INSERT INTO note_revisions_mig (noteRevisionId, noteId, title, contentLength, isErased, isProtected, utcDateLastEdited, utcDateCreated, utcDateModified, dateLastEdited, dateCreated, type, mime, hash)
 SELECT noteRevisionId, noteId, title, contentLength, 0, 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;
 UPDATE note_revisions SET isErased = (SELECT isErased FROM notes WHERE notes.noteId = note_revisions.noteId);
 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/0154__system_links_should_follow_camelCase.sql
+++ b/db/migrations/0154__system_links_should_follow_camelCase.sql
@@ -0,0 +1,3 @@
 UPDATE attributes SET name = 'internalLink' WHERE name = 'internal-link';
 UPDATE attributes SET name = 'imageLink' WHERE name = 'image-link';
 UPDATE attributes SET name = 'relationMapLink' WHERE name = 'relation-map-link';
--- a/db/migrations/0155__indexes.sql
+++ b/db/migrations/0155__indexes.sql
@@ -0,0 +1,5 @@
 DROP INDEX IF EXISTS IDX_attributes_name_index;
 DROP INDEX IF EXISTS IDX_branches_noteId;
 CREATE INDEX IDX_source_ids_utcDateCreated
    on source_ids (utcDateCreated);
--- a/db/migrations/0156__add_deleteId.sql
+++ b/db/migrations/0156__add_deleteId.sql
@@ -0,0 +1,81 @@
 CREATE TABLE IF NOT EXISTS "notes_mig" (
                                           `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`));
 INSERT INTO notes_mig (noteId, title, contentLength, isProtected, type, mime, hash, isDeleted, isErased, dateCreated, dateModified, utcDateCreated, utcDateModified)
 SELECT noteId, title, -1, isProtected, type, mime, hash, isDeleted, 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 "branches_mig" (
                                          `branchId`	TEXT NOT NULL,
                                          `noteId`	TEXT NOT NULL,
                                          `parentNoteId`	TEXT NOT NULL,
                                          `notePosition`	INTEGER NOT NULL,
                                          `prefix`	TEXT,
                                          `isExpanded`	INTEGER NOT NULL DEFAULT 0,
                                          `isDeleted`	INTEGER NOT NULL DEFAULT 0,
                                          `deleteId`    TEXT DEFAULT NULL,
                                          `utcDateModified`	TEXT NOT NULL,
                                          utcDateCreated TEXT NOT NULL,
                                          hash TEXT DEFAULT "" NOT NULL,
                                          PRIMARY KEY(`branchId`));
 INSERT INTO branches_mig (branchId, noteId, parentNoteId, notePosition, prefix, isExpanded, isDeleted, utcDateModified, utcDateCreated, hash)
    SELECT branchId, noteId, parentNoteId, notePosition, prefix, isExpanded, isDeleted, utcDateModified, utcDateCreated, hash FROM branches;
 DROP TABLE branches;
 ALTER TABLE branches_mig RENAME TO branches;
 CREATE INDEX `IDX_branches_noteId_parentNoteId` ON `branches` (`noteId`,`parentNoteId`);
 CREATE INDEX IDX_branches_parentNoteId ON branches (parentNoteId);
 CREATE TABLE IF NOT EXISTS "attributes_mig"
 (
    attributeId      TEXT not null primary key,
    noteId       TEXT not null,
    type         TEXT not null,
    name         TEXT not null,
    value        TEXT default '' not null,
    position     INT  default 0 not null,
    utcDateCreated  TEXT not null,
    utcDateModified TEXT not null,
    isDeleted    INT  not null,
    `deleteId`    TEXT DEFAULT NULL,
    hash         TEXT default "" not null,
    isInheritable int DEFAULT 0 NULL);
 INSERT INTO attributes_mig (attributeId, noteId, type, name, value, position, utcDateCreated, utcDateModified, isDeleted, hash, isInheritable)
 SELECT attributeId, noteId, type, name, value, position, utcDateCreated, utcDateModified, isDeleted, hash, isInheritable FROM attributes;
 DROP TABLE attributes;
 ALTER TABLE attributes_mig RENAME TO attributes;
 CREATE INDEX IDX_attributes_name_value
    on attributes (name, value);
 CREATE INDEX IDX_attributes_noteId_index
    on attributes (noteId);
 CREATE INDEX IDX_attributes_value_index
    on attributes (value);
--- a/db/migrations/0157__fix_contentLength.sql
+++ b/db/migrations/0157__fix_contentLength.sql
@@ -0,0 +1 @@
 UPDATE notes SET contentLength = COALESCE((SELECT COALESCE(LENGTH(content), 0) FROM note_contents WHERE note_contents.noteId = notes.noteId), -1);
--- a/db/migrations/0158__add_isSynced_to_sync.sql
+++ b/db/migrations/0158__add_isSynced_to_sync.sql
@@ -0,0 +1,22 @@
 CREATE TABLE IF NOT EXISTS "sync_mig" (
                                          `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);
 INSERT INTO sync_mig (id, entityName, entityId, sourceId, isSynced, utcSyncDate)
 SELECT id, entityName, entityId, sourceId, 1, utcSyncDate FROM sync;
 DROP TABLE sync;
 ALTER TABLE sync_mig RENAME TO sync;
 CREATE UNIQUE INDEX `IDX_sync_entityName_entityId` ON `sync` (
                                                              `entityName`,
                                                              `entityId`
    );
 CREATE INDEX `IDX_sync_utcSyncDate` ON `sync` (
                                               `utcSyncDate`
    );
--- 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,27 +1,3 @@
 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,
                                    `utcSyncDate`	TEXT NOT NULL);
 CREATE TABLE IF NOT EXISTS "source_ids" (
                                          `sourceId`	TEXT NOT NULL,
                                          `utcDateCreated`	TEXT NOT NULL,
                                          PRIMARY KEY(`sourceId`)
 );
 CREATE TABLE IF NOT EXISTS "note_revisions" (
                                              `noteRevisionId`	TEXT NOT NULL PRIMARY KEY,
                                              `noteId`	TEXT NOT NULL,
                                              `title`	TEXT,
                                              `content`	TEXT,
                                              `isProtected`	INT NOT NULL DEFAULT 0,
                                              `utcDateModifiedFrom` TEXT NOT NULL,
                                              `utcDateModifiedTo` TEXT NOT NULL,
                                              `dateModifiedFrom` TEXT NOT NULL,
                                              `dateModifiedTo` TEXT NOT NULL,
                                              type TEXT DEFAULT '' NOT NULL,
                                              mime TEXT DEFAULT '' NOT NULL,
                                              hash TEXT DEFAULT "" NOT NULL);
 CREATE TABLE IF NOT EXISTS "api_tokens"
 (
  apiTokenId TEXT PRIMARY KEY NOT NULL,
@@ -38,64 +14,6 @@ CREATE TABLE IF NOT EXISTS "options"
  utcDateCreated TEXT not null,
  utcDateModified TEXT NOT NULL
 );
 CREATE TABLE IF NOT EXISTS "attributes"
 (
  attributeId      TEXT not null primary key,
  noteId       TEXT not null,
  type         TEXT not null,
  name         TEXT not null,
  value        TEXT default '' not null,
  position     INT  default 0 not null,
  utcDateCreated  TEXT not null,
  utcDateModified TEXT not null,
  isDeleted    INT  not null,
  hash         TEXT default "" not null,
  isInheritable int DEFAULT 0 NULL);
 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,
                                     `dateCreated`	TEXT NOT NULL,
                                     `dateModified`	TEXT NOT NULL,
                                     `utcDateCreated`	TEXT NOT NULL,
                                     `utcDateModified`	TEXT NOT NULL,
                                     PRIMARY KEY(`noteId`)
 );
 CREATE UNIQUE INDEX `IDX_sync_entityName_entityId` ON `sync` (
                                                              `entityName`,
                                                              `entityId`
  );
 CREATE INDEX `IDX_sync_utcSyncDate` ON `sync` (
                                            `utcSyncDate`
  );
 CREATE INDEX `IDX_note_revisions_noteId` ON `note_revisions` (
                                                              `noteId`
  );
 CREATE INDEX `IDX_note_revisions_dateModifiedFrom` ON `note_revisions` (
                                                                        `utcDateModifiedFrom`
  );
 CREATE INDEX `IDX_note_revisions_dateModifiedTo` ON `note_revisions` (
                                                                      `utcDateModifiedTo`
  );
 CREATE INDEX IDX_attributes_name_value
  on attributes (name, value);
 CREATE INDEX IDX_attributes_name_index
  on attributes (name);
 CREATE INDEX IDX_attributes_noteId_index
  on attributes (noteId);
 CREATE INDEX IDX_attributes_value_index
  on attributes (value);
 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,
@@ -104,6 +22,10 @@ CREATE TABLE recent_notes
    utcDateCreated TEXT not null,
    isDeleted INT
 );
 CREATE TABLE IF NOT EXISTS "note_revision_contents" (`noteRevisionId`	TEXT NOT NULL PRIMARY KEY,
                                                 `content`	TEXT,
                                                 hash TEXT DEFAULT '' NOT NULL,
                                                 `utcDateModified` TEXT NOT NULL);
 CREATE TABLE IF NOT EXISTS "branches" (
                                          `branchId`	TEXT NOT NULL,
                                          `noteId`	TEXT NOT NULL,
@@ -112,10 +34,92 @@ CREATE TABLE IF NOT EXISTS "branches" (
                                          `prefix`	TEXT,
                                          `isExpanded`	INTEGER NOT NULL DEFAULT 0,
                                          `isDeleted`	INTEGER NOT NULL DEFAULT 0,
                                          `deleteId`    TEXT DEFAULT NULL,
                                          `utcDateModified`	TEXT NOT NULL,
                                          utcDateCreated TEXT NOT NULL,
                                          hash TEXT DEFAULT "" NOT NULL,
                                          PRIMARY KEY(`branchId`));
 CREATE INDEX `IDX_branches_noteId` ON `branches` (`noteId`);
 CREATE INDEX `IDX_branches_noteId_parentNoteId` ON `branches` (`noteId`,`parentNoteId`);
 CREATE INDEX IDX_branches_parentNoteId ON branches (parentNoteId);
 CREATE TABLE IF NOT EXISTS "attributes"
 (
    attributeId      TEXT not null primary key,
    noteId       TEXT not null,
    type         TEXT not null,
    name         TEXT not null,
    value        TEXT default '' not null,
    position     INT  default 0 not null,
    utcDateCreated  TEXT not null,
    utcDateModified TEXT not null,
    isDeleted    INT  not null,
    `deleteId`    TEXT DEFAULT NULL,
    hash         TEXT default "" not null,
    isInheritable int DEFAULT 0 NULL);
 CREATE INDEX IDX_attributes_name_value
    on attributes (name, value);
 CREATE INDEX IDX_attributes_noteId_index
    on attributes (noteId);
 CREATE INDEX IDX_attributes_value_index
    on attributes (value);
 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_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
@@ -28,7 +28,7 @@
 <header>
-        <h2><span class="attribs"><span class="type-signature"></span></span>ApiToken<span class="signature">(apiTokenId, token, isDeleted, utcDateCreated)</span><span class="type-signature"></span></h2>
+        <h2><span class="attribs"><span class="type-signature"></span></span>ApiToken<span class="signature">()</span><span class="type-signature"></span></h2>
            <div class="class-description">ApiToken is an entity representing token used to authenticate against Trilium API from client applications. Currently used only by Trilium Sender.</div>
@@ -45,7 +45,7 @@
-    <h4 class="name" id="ApiToken"><span class="type-signature"></span>new ApiToken<span class="signature">(apiTokenId, token, isDeleted, utcDateCreated)</span><span class="type-signature"></span></h4>
+    <h4 class="name" id="ApiToken"><span class="type-signature"></span>new ApiToken<span class="signature">()</span><span class="type-signature"></span></h4>
@@ -60,10 +60,15 @@
-    <h5>Parameters:</h5>
+
    <h5 class="subsection-title">Properties:</h5>
-<table class="params">
+<table class="props">
    <thead>
    <tr>
@@ -180,8 +185,6 @@
 <dl class="details">
@@ -290,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
@@ -28,7 +28,7 @@
 <header>
-        <h2><span class="attribs"><span class="type-signature"></span></span>Attribute<span class="signature">(attributeId, noteId, type, name, value, position, isInheritable, isDeleted, utcDateCreated, utcDateModified)</span><span class="type-signature"></span></h2>
+        <h2><span class="attribs"><span class="type-signature"></span></span>Attribute<span class="signature">()</span><span class="type-signature"></span></h2>
            <div class="class-description">Attribute is key value pair owned by a note.</div>
@@ -45,7 +45,7 @@
-    <h4 class="name" id="Attribute"><span class="type-signature"></span>new Attribute<span class="signature">(attributeId, noteId, type, name, value, position, isInheritable, isDeleted, utcDateCreated, utcDateModified)</span><span class="type-signature"></span></h4>
+    <h4 class="name" id="Attribute"><span class="type-signature"></span>new Attribute<span class="signature">()</span><span class="type-signature"></span></h4>
@@ -60,10 +60,15 @@
-    <h5>Parameters:</h5>
+
    <h5 class="subsection-title">Properties:</h5>
-<table class="params">
+<table class="props">
    <thead>
    <tr>
@@ -267,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>
@@ -318,8 +349,6 @@
 <dl class="details">
@@ -349,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>
@@ -464,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>
@@ -566,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>
@@ -668,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>
@@ -738,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#line312">line 312</a>
    </li></ul></dd>
 </dl>
 <h4 class="name" id="startNote"><span class="type-signature"></span>startNote<span class="type-signature"></span></h4>
@@ -534,6 +471,375 @@ the backend.
    <h4 class="name" id="createDataNote"><span class="type-signature"></span>createDataNote<span class="signature">(parentNoteId, title, content)</span><span class="type-signature"> &rarr; {Promise.&lt;{note: <a href="Note.html">Note</a>, branch: <a href="Branch.html">Branch</a>}>}</span></h4>
 <div class="description">
    Create data note - data in this context means object serializable to JSON. Created note will be of type 'code' and
 JSON MIME type. See also createNewNote() for more options.
 </div>
    <h5>Parameters:</h5>
 <table class="params">
    <thead>
    <tr>
        <th>Name</th>
        <th>Type</th>
        <th class="last">Description</th>
    </tr>
    </thead>
    <tbody>
        <tr>
                <td class="name"><code>parentNoteId</code></td>
            <td class="type">
 <span class="param-type">string</span>
            </td>
            <td class="description last"></td>
        </tr>
        <tr>
                <td class="name"><code>title</code></td>
            <td class="type">
 <span class="param-type">string</span>
            </td>
            <td class="description last"></td>
        </tr>
        <tr>
                <td class="name"><code>content</code></td>
            <td class="type">
 <span class="param-type">object</span>
            </td>
            <td class="description last"></td>
        </tr>
    </tbody>
 </table>
 <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#line204">line 204</a>
    </li></ul></dd>
 </dl>
 <h5>Returns:</h5>
 <dl>
    <dt>
        Type
    </dt>
    <dd>
 <span class="param-type">Promise.&lt;{note: <a href="Note.html">Note</a>, branch: <a href="Branch.html">Branch</a>}></span>
    </dd>
 </dl>
    <h4 class="name" id="createNewNote"><span class="type-signature"></span>createNewNote<span class="signature">(params<span class="signature-attributes">opt</span>)</span><span class="type-signature"> &rarr; {Promise.&lt;{note: <a href="Note.html">Note</a>, branch: <a href="Branch.html">Branch</a>}>}</span></h4>
    <h5>Parameters:</h5>
 <table class="params">
    <thead>
    <tr>
        <th>Name</th>
        <th>Type</th>
        <th>Attributes</th>
        <th class="last">Description</th>
    </tr>
    </thead>
    <tbody>
        <tr>
                <td class="name"><code>params</code></td>
            <td class="type">
 <span class="param-type"><a href="global.html#CreateNewNoteParams">CreateNewNoteParams</a></span>
            </td>
                <td class="attributes">
                    &lt;optional><br>
                </td>
            <td class="description last"></td>
        </tr>
    </tbody>
 </table>
 <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#line231">line 231</a>
    </li></ul></dd>
 </dl>
 <h5>Returns:</h5>
 <div class="param-desc">
    object contains newly created entities note and branch
 </div>
 <dl>
    <dt>
        Type
    </dt>
    <dd>
 <span class="param-type">Promise.&lt;{note: <a href="Note.html">Note</a>, branch: <a href="Branch.html">Branch</a>}></span>
    </dd>
 </dl>
    <h4 class="name" id="createNote"><span class="type-signature"></span>createNote<span class="signature">(parentNoteId, title, content<span class="signature-attributes">opt</span>, extraOptions<span class="signature-attributes">opt</span>)</span><span class="type-signature"> &rarr; {Promise.&lt;{note: <a href="Note.html">Note</a>, branch: <a href="Branch.html">Branch</a>}>}</span></h4>
@@ -748,6 +1054,8 @@ the backend.
        <dt class="important tag-deprecated">Deprecated:</dt><dd><ul class="dummy"><li>please use createNote() API method instead</li></ul></dd>
@@ -760,7 +1068,7 @@ the backend.
    <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#line198">line 198</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>
@@ -818,7 +1126,7 @@ the backend.
-    <h4 class="name" id="createNoteAndRefresh"><span class="type-signature"></span>createNoteAndRefresh<span class="signature">(parentNoteId, title, content<span class="signature-attributes">opt</span>, extraOptions<span class="signature-attributes">opt</span>)</span><span class="type-signature"> &rarr; {Promise.&lt;{note: <a href="Note.html">Note</a>, branch: <a href="Branch.html">Branch</a>}>}</span></h4>
+    <h4 class="name" id="createTextNote"><span class="type-signature"></span>createTextNote<span class="signature">(parentNoteId, title, content)</span><span class="type-signature"> &rarr; {Promise.&lt;{note: <a href="Note.html">Note</a>, branch: <a href="Branch.html">Branch</a>}>}</span></h4>
@@ -826,7 +1134,7 @@ the backend.
 <div class="description">
-    Creates new note according to given params and force all connected clients to refresh their tree.
+    Create text note. See also createNewNote() for more options.
 </div>
@@ -850,12 +1158,8 @@ the backend.
        <th>Type</th>
        <th>Attributes</th>
        <th>Default</th>
        <th class="last">Description</th>
    </tr>
@@ -879,22 +1183,10 @@ the backend.
            </td>
                <td class="attributes">
                </td>
                <td class="default">
                </td>
-            <td class="description last">create new note under this parent</td>
+            <td class="description last"></td>
        </tr>
@@ -914,19 +1206,7 @@ the backend.
            </td>
                <td class="attributes">
                </td>
                <td class="default">
                </td>
            <td class="description last"></td>
@@ -949,62 +1229,7 @@ the backend.
            </td>
                <td class="attributes">
                    &lt;optional><br>
                </td>
                <td class="default">
                    ""
                </td>
            <td class="description last"></td>
        </tr>
        <tr>
                <td class="name"><code>extraOptions</code></td>
            <td class="type">
 <span class="param-type"><a href="global.html#CreateNoteExtraOptions">CreateNoteExtraOptions</a></span>
            </td>
                <td class="attributes">
                    &lt;optional><br>
                </td>
                <td class="default">
                    {}
                </td>
            <td class="description last"></td>
@@ -1048,7 +1273,7 @@ the backend.
    <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#line211">line 211</a>
+        <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line188">line 188</a>
    </li></ul></dd>
@@ -1076,10 +1301,6 @@ the backend.
 <h5>Returns:</h5>
 <div class="param-desc">
    object contains newly created entities note and branch
 </div>
 <dl>
@@ -1533,7 +1754,7 @@ the backend.
    <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#line317">line 317</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>
@@ -1997,7 +2218,7 @@ the backend.
    <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#line241">line 241</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>
@@ -2765,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#line260">line 260</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>
@@ -3418,7 +3639,113 @@ 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#line232">line 232</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>
 </dl>
 <h5>Returns:</h5>
 <dl>
    <dt>
        Type
    </dt>
    <dd>
 <span class="param-type">Promise.&lt;(<a href="Note.html">Note</a>|null)></span>
    </dd>
 </dl>
    <h4 class="name" id="getTodayNote"><span class="type-signature"></span>getTodayNote<span class="signature">()</span><span class="type-signature"> &rarr; {Promise.&lt;(<a href="Note.html">Note</a>|null)>}</span></h4>
 <div class="description">
    Returns today's day note. If such note doesn't exist, it is created.
 </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#line323">line 323</a>
    </li></ul></dd>
@@ -3596,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#line251">line 251</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>
@@ -3751,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#line269">line 269</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>
@@ -3901,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#line224">line 224</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>
@@ -4249,7 +4662,7 @@ if some action needs to happen on only one specific instance.
-    <h4 class="name" id="setNoteToParent"><span class="type-signature"></span>setNoteToParent<span class="signature">(noteId, prefix, parentNoteId<span class="signature-attributes">opt</span>)</span><span class="type-signature"></span></h4>
+    <h4 class="name" id="setNoteToParent"><span class="type-signature"></span>setNoteToParent<span class="signature">(noteId, prefix, parentNoteId)</span><span class="type-signature"></span></h4>
@@ -4284,8 +4697,6 @@ This method looks similar to toggleNoteInParent() but differs because we're look
        <th>Type</th>
        <th>Attributes</th>
@@ -4311,14 +4722,6 @@ This method looks similar to toggleNoteInParent() but differs because we're look
            </td>
                <td class="attributes">
                </td>
@@ -4342,14 +4745,6 @@ This method looks similar to toggleNoteInParent() but differs because we're look
            </td>
                <td class="attributes">
                </td>
@@ -4367,22 +4762,15 @@ This method looks similar to toggleNoteInParent() but differs because we're look
 <span class="param-type">string</span>
 |
 <span class="param-type">null</span>
            </td>
                <td class="attributes">
                    &lt;optional><br>
                </td>
@@ -4415,6 +4803,8 @@ This method looks similar to toggleNoteInParent() but differs because we're look
        <dt class="important tag-deprecated">Deprecated:</dt><dd><ul class="dummy"><li>- this method is pretty confusing and serves specialized purpose only</li></ul></dd>
@@ -4427,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#line289">line 289</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>
@@ -4560,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#line276">line 276</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>
@@ -4935,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#line302">line 302</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>
@@ -5009,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
@@ -28,7 +28,7 @@
 <header>
-        <h2><span class="attribs"><span class="type-signature"></span></span>Branch<span class="signature">(branchId, noteId, parentNoteId, notePosition, prefix, isExpanded, isDeleted, utcDateModified, utcDateCreated)</span><span class="type-signature"></span></h2>
+        <h2><span class="attribs"><span class="type-signature"></span></span>Branch<span class="signature">()</span><span class="type-signature"></span></h2>
            <div class="class-description">Branch represents note's placement in the tree - it's essentially pair of noteId and parentNoteId.
 Each note can have multiple (at least one) branches, meaning it can be placed into multiple places in the tree.</div>
@@ -46,7 +46,7 @@ Each note can have multiple (at least one) branches, meaning it can be placed in
-    <h4 class="name" id="Branch"><span class="type-signature"></span>new Branch<span class="signature">(branchId, noteId, parentNoteId, notePosition, prefix, isExpanded, isDeleted, utcDateModified, utcDateCreated)</span><span class="type-signature"></span></h4>
+    <h4 class="name" id="Branch"><span class="type-signature"></span>new Branch<span class="signature">()</span><span class="type-signature"></span></h4>
@@ -61,10 +61,15 @@ Each note can have multiple (at least one) branches, meaning it can be placed in
-    <h5>Parameters:</h5>
+
    <h5 class="subsection-title">Properties:</h5>
-<table class="params">
+<table class="props">
    <thead>
    <tr>
@@ -245,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>
@@ -296,8 +327,6 @@ Each note can have multiple (at least one) branches, meaning it can be placed in
 <dl class="details">
@@ -327,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>
@@ -394,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>
@@ -442,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>
@@ -478,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>
@@ -515,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
--- a/docs/backend_api/NoteRevision.html
+++ b/docs/backend_api/NoteRevision.html
@@ -28,7 +28,7 @@
 <header>
-        <h2><span class="attribs"><span class="type-signature"></span></span>NoteRevision<span class="signature">(noteRevisionId, noteId, type, mime, title, content, isProtected, dateModifiedFrom, dateModifiedTo, utcDateModifiedFrom, utcDateModifiedTo)</span><span class="type-signature"></span></h2>
+        <h2><span class="attribs"><span class="type-signature"></span></span>NoteRevision<span class="signature">()</span><span class="type-signature"></span></h2>
            <div class="class-description">NoteRevision represents snapshot of note's title and content at some point in the past. It's used for seamless note versioning.</div>
@@ -45,7 +45,7 @@
-    <h4 class="name" id="NoteRevision"><span class="type-signature"></span>new NoteRevision<span class="signature">(noteRevisionId, noteId, type, mime, title, content, isProtected, dateModifiedFrom, dateModifiedTo, utcDateModifiedFrom, utcDateModifiedTo)</span><span class="type-signature"></span></h4>
+    <h4 class="name" id="NoteRevision"><span class="type-signature"></span>new NoteRevision<span class="signature">()</span><span class="type-signature"></span></h4>
@@ -60,10 +60,15 @@
-    <h5>Parameters:</h5>
+
    <h5 class="subsection-title">Properties:</h5>
-<table class="params">
+<table class="props">
    <thead>
    <tr>
@@ -200,13 +205,36 @@
        <tr>
-                <td class="name"><code>content</code></td>
+                <td class="name"><code>contentLength</code></td>
            <td class="type">
-<span class="param-type">string</span>
+<span class="param-type">int</span>
            </td>
            <td class="description last"></td>
        </tr>
        <tr>
                <td class="name"><code>isErased</code></td>
            <td class="type">
 <span class="param-type">boolean</span>
@@ -229,7 +257,7 @@
            <td class="type">
-<span class="param-type">string</span>
+<span class="param-type">boolean</span>
@@ -246,7 +274,7 @@
        <tr>
-                <td class="name"><code>dateModifiedFrom</code></td>
+                <td class="name"><code>dateLastEdited</code></td>
            <td class="type">
@@ -269,7 +297,7 @@
        <tr>
-                <td class="name"><code>dateModifiedTo</code></td>
+                <td class="name"><code>dateCreated</code></td>
            <td class="type">
@@ -292,7 +320,7 @@
        <tr>
-                <td class="name"><code>utcDateModifiedFrom</code></td>
+                <td class="name"><code>utcDateLastEdited</code></td>
            <td class="type">
@@ -315,7 +343,30 @@
        <tr>
-                <td class="name"><code>utcDateModifiedTo</code></td>
+                <td class="name"><code>utcDateCreated</code></td>
            <td class="type">
 <span class="param-type">string</span>
            </td>
            <td class="description last"></td>
        </tr>
        <tr>
                <td class="name"><code>utcDateModified</code></td>
            <td class="type">
@@ -341,8 +392,6 @@
 <dl class="details">
@@ -372,7 +421,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#line29">line 29</a>
+        <a href="entities_note_revision.js.html">entities/note_revision.js</a>, <a href="entities_note_revision.js.html#line35">line 35</a>
    </li></ul></dd>
@@ -431,6 +480,320 @@
        <h3 class="subsection-title">Methods</h3>
    <h4 class="name" id="getContent"><span class="type-signature">(async) </span>getContent<span class="signature">()</span><span class="type-signature"> &rarr; {Promise.&lt;*>}</span></h4>
 <dl class="details">
    <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#line69">line 69</a>
    </li></ul></dd>
 </dl>
 <h5>Returns:</h5>
 <dl>
    <dt>
        Type
    </dt>
    <dd>
 <span class="param-type">Promise.&lt;*></span>
    </dd>
 </dl>
    <h4 class="name" id="isStringNote"><span class="type-signature"></span>isStringNote<span class="signature">()</span><span class="type-signature"> &rarr; {boolean}</span></h4>
 <dl class="details">
    <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#line55">line 55</a>
    </li></ul></dd>
 </dl>
 <h5>Returns:</h5>
 <div class="param-desc">
    true if the note has string content (not binary)
 </div>
 <dl>
    <dt>
        Type
    </dt>
    <dd>
 <span class="param-type">boolean</span>
    </dd>
 </dl>
    <h4 class="name" id="setContent"><span class="type-signature">(async) </span>setContent<span class="signature">()</span><span class="type-signature"> &rarr; {Promise}</span></h4>
 <dl class="details">
    <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#line105">line 105</a>
    </li></ul></dd>
 </dl>
 <h5>Returns:</h5>
 <dl>
    <dt>
        Type
    </dt>
    <dd>
 <span class="param-type">Promise</span>
    </dd>
 </dl>
@@ -451,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
@@ -28,7 +28,7 @@
 <header>
-        <h2><span class="attribs"><span class="type-signature"></span></span>Option<span class="signature">(name, value, isSynced, utcDateModified, utcDateCreated)</span><span class="type-signature"></span></h2>
+        <h2><span class="attribs"><span class="type-signature"></span></span>Option<span class="signature">()</span><span class="type-signature"></span></h2>
            <div class="class-description">Option represents name-value pair, either directly configurable by the user or some system property.</div>
@@ -45,7 +45,7 @@
-    <h4 class="name" id="Option"><span class="type-signature"></span>new Option<span class="signature">(name, value, isSynced, utcDateModified, utcDateCreated)</span><span class="type-signature"></span></h4>
+    <h4 class="name" id="Option"><span class="type-signature"></span>new Option<span class="signature">()</span><span class="type-signature"></span></h4>
@@ -60,10 +60,15 @@
-    <h5>Parameters:</h5>
+
    <h5 class="subsection-title">Properties:</h5>
-<table class="params">
+<table class="props">
    <thead>
    <tr>
@@ -203,8 +208,6 @@
 <dl class="details">
@@ -313,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
@@ -28,7 +28,7 @@
 <header>
-        <h2><span class="attribs"><span class="type-signature"></span></span>RecentNote<span class="signature">(noteId, notePath, isDeleted, utcDateModified)</span><span class="type-signature"></span></h2>
+        <h2><span class="attribs"><span class="type-signature"></span></span>RecentNote<span class="signature">()</span><span class="type-signature"></span></h2>
            <div class="class-description">RecentNote represents recently visited note.</div>
@@ -45,7 +45,7 @@
-    <h4 class="name" id="RecentNote"><span class="type-signature"></span>new RecentNote<span class="signature">(noteId, notePath, isDeleted, utcDateModified)</span><span class="type-signature"></span></h4>
+    <h4 class="name" id="RecentNote"><span class="type-signature"></span>new RecentNote<span class="signature">()</span><span class="type-signature"></span></h4>
@@ -60,10 +60,15 @@
-    <h5>Parameters:</h5>
+
    <h5 class="subsection-title">Properties:</h5>
-<table class="params">
+<table class="props">
    <thead>
    <tr>
@@ -180,8 +185,6 @@
 <dl class="details">
@@ -290,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
@@ -34,10 +34,10 @@ const dateUtils = require('../services/date_utils');
 /**
 * ApiToken is an entity representing token used to authenticate against Trilium API from client applications. Currently used only by Trilium Sender.
 *
- * @param {string} apiTokenId - primary key
+ * @property {string} apiTokenId - primary key
- * @param {string} token
+ * @property {string} token
- * @param {boolean} isDeleted - true if API token is deleted
+ * @property {boolean} isDeleted - true if API token is deleted
- * @param {string} utcDateCreated
+ * @property {string} utcDateCreated
 *
 * @extends Entity
 */
@@ -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
@@ -36,16 +36,17 @@ const sql = require('../services/sql');
 /**
 * Attribute is key value pair owned by a note.
 *
- * @param {string} attributeId
+ * @property {string} attributeId
- * @param {string} noteId
+ * @property {string} noteId
- * @param {string} type
+ * @property {string} type
- * @param {string} name
+ * @property {string} name
- * @param {string} value
+ * @property {string} value
- * @param {int} position
+ * @property {int} position
- * @param {boolean} isInheritable
+ * @property {boolean} isInheritable
- * @param {boolean} isDeleted
+ * @property {boolean} isDeleted
- * @param {string} utcDateCreated
+ * @property {string|null} deleteId - ID identifying delete transaction
- * @param {string} utcDateModified
+ * @property {string} utcDateCreated
 * @property {string} utcDateModified
 *
 * @extends Entity
 */
@@ -72,11 +73,7 @@ class Attribute extends Entity {
     * @returns {Promise&lt;Note|null>}
     */
    async getNote() {
-        if (!this.__note) {
+        return await repository.getNote(this.noteId);
            this.__note = await repository.getEntity("SELECT * FROM notes WHERE noteId = ?", [this.noteId]);
        }
        return this.__note;
    }
    /**
@@ -91,11 +88,7 @@ class Attribute extends Entity {
            return null;
        }
-        if (!this.__targetNote) {
+        return await repository.getNote(this.value);
            this.__targetNote = await repository.getEntity("SELECT * FROM notes WHERE noteId = ?", [this.value]);
        }
        return this.__targetNote;
    }
    /**
@@ -107,6 +100,10 @@ class Attribute extends Entity {
    async beforeSaving() {
        if (!this.value) {
            if (this.type === 'relation') {
                throw new Error(`Cannot save relation ${this.name} since it does not target any note.`);
            }
            // null value isn't allowed
            this.value = "";
        }
@@ -137,6 +134,21 @@ class Attribute extends Entity {
    // cannot be static!
    updatePojo(pojo) {
        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
        });
    }
 }
@@ -156,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
@@ -37,15 +37,16 @@ const sql = require('../services/sql');
 * Branch represents note's placement in the tree - it's essentially pair of noteId and parentNoteId.
 * Each note can have multiple (at least one) branches, meaning it can be placed into multiple places in the tree.
 *
- * @param {string} branchId - primary key
+ * @property {string} branchId - primary key
- * @param {string} noteId
+ * @property {string} noteId
- * @param {string} parentNoteId
+ * @property {string} parentNoteId
- * @param {int} notePosition
+ * @property {int} notePosition
- * @param {string} prefix
+ * @property {string} prefix
- * @param {boolean} isExpanded
+ * @property {boolean} isExpanded
- * @param {boolean} isDeleted
+ * @property {boolean} isDeleted
- * @param {string} utcDateModified
+ * @property {string|null} deleteId - ID identifying delete transaction
- * @param {string} utcDateCreated
+ * @property {string} utcDateModified
 * @property {string} utcDateCreated
 *
 * @extends Entity
 */
@@ -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 = {}) {
+    /** @returns {Promise&lt;Note|null>} */
-        super(row);
+    async getNote() {
-
+        return await repository.getNote(this.noteId);
        // used to detect move in note tree
        this.origParentNoteId = this.parentNoteId;
    }
-    /** @returns {Note|null} */
+    /** @returns {Promise&lt;Note|null>} */
-    async getNote() {
+    async getParentNote() {
-        return await repository.getEntity("SELECT * FROM notes WHERE noteId = ?", [this.noteId]);
+        return await repository.getNote(this.parentNoteId);
    }
    async beforeSaving() {
@@ -73,6 +72,10 @@ class Branch extends Entity {
            this.notePosition = maxNotePos === null ? 0 : maxNotePos + 10;
        }
        if (!this.isExpanded) {
            this.isExpanded = false;
        }
        if (!this.isDeleted) {
            this.isDeleted = false;
        }
@@ -88,9 +91,17 @@ class Branch extends Entity {
        }
    }
-    // cannot be static!
+    createClone(parentNoteId, notePosition) {
-    updatePojo(pojo) {
+        return new Branch({
-        delete pojo.origParentNoteId;
+            noteId: this.noteId,
            parentNoteId: parentNoteId,
            notePosition: notePosition,
            prefix: this.prefix,
            isExpanded: this.isExpanded,
            isDeleted: false,
            utcDateCreated: this.utcDateCreated,
            utcDateModified: this.utcDateModified
        });
    }
 }
@@ -110,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
@@ -42,8 +42,6 @@ const LABEL_DEFINITION = 'label-definition';
 const RELATION = 'relation';
 const RELATION_DEFINITION = 'relation-definition';
 const STRING_MIME_TYPES = ["application/x-javascript"];
 /**
 * This represents a Note which is a central object in the Trilium Notes project.
 *
@@ -51,8 +49,11 @@ const STRING_MIME_TYPES = ["application/x-javascript"];
 * @property {string} type - one of "text", "code", "file" or "render"
 * @property {string} mime - MIME type, e.g. "text/html"
 * @property {string} title - note title
 * @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)
 * @property {string} utcDateCreated
@@ -63,7 +64,7 @@ const STRING_MIME_TYPES = ["application/x-javascript"];
 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
@@ -72,7 +73,7 @@ class Note extends Entity {
        super(row);
        this.isProtected = !!this.isProtected;
-        /* true if content (meaning any kind of potentially encrypted content) is either not encrypted
+        /* true if content is either not encrypted
         * or encrypted, but with available protected session (so effectively decrypted) */
        this.isContentAvailable = true;
@@ -81,7 +82,7 @@ class Note extends Entity {
            this.isContentAvailable = protectedSessionService.isProtectedSessionAvailable();
            if (this.isContentAvailable) {
-                protectedSessionService.decryptNote(this);
+                this.title = protectedSessionService.decryptString(this.title);
            }
            else {
                this.title = "[protected]";
@@ -116,34 +117,46 @@ class Note extends Entity {
            if (this.isProtected) {
                if (this.isContentAvailable) {
-                    protectedSessionService.decryptNoteContent(this);
+                    this.content = this.content === null ? null : protectedSessionService.decrypt(this.content);
                }
                else {
                    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);
    }
    /** @returns {Promise} */
    async setContent(content) {
-        // force updating note itself so that dateChanged is represented correctly even for the content
+        if (content === null || content === undefined) {
            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.byteLength;
        await this.save();
        this.content = content;
@@ -152,12 +165,12 @@ 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) {
            if (this.isContentAvailable) {
-                protectedSessionService.encryptNoteContent(pojo);
+                pojo.content = protectedSessionService.encrypt(pojo.content);
            }
            else {
                throw new Error(`Cannot update content of noteId=${this.noteId} since we're out of protected session.`);
@@ -199,9 +212,7 @@ class Note extends Entity {
    /** @returns {boolean} true if the note has string content (not binary) */
    isStringNote() {
-        return ["text", "code", "relation-map", "search"].includes(this.type)
+        return utils.isStringNote(this.type, this.mime);
            || this.mime.startsWith('text/')
            || STRING_MIME_TYPES.includes(this.mime);
    }
    /** @returns {string} JS script environment - either "frontend" or "backend" */
@@ -221,26 +232,36 @@ class Note extends Entity {
        return null;
    }
    async loadOwnedAttributesToCache() {
        this.__ownedAttributeCache = await repository.getEntities(`SELECT * FROM attributes WHERE isDeleted = 0 AND noteId = ?`, [this.noteId]);
        return this.__ownedAttributeCache;
    }
    /**
-     * @returns {Promise&lt;Attribute[]>} attributes belonging to this specific note (excludes inherited attributes)
+     * This method is a faster variant of getAttributes() which looks for only owned attributes.
     * Use when inheritance is not needed and/or in batch/performance sensitive operations.
     *
-     * This method can be significantly faster than the getAttributes()
+     * @param {string} [type] - (optional) attribute type to filter
     * @param {string} [name] - (optional) attribute name to filter
     * @returns {Promise&lt;Attribute[]>} note's "owned" attributes - excluding inherited ones
     */
    async getOwnedAttributes(type, name) {
-        let query = `SELECT * FROM attributes WHERE isDeleted = 0 AND noteId = ?`;
+        if (!this.__ownedAttributeCache) {
-        const params = [this.noteId];
+            await this.loadOwnedAttributesToCache();
        if (type) {
            query += ` AND type = ?`;
            params.push(type);
        }
-        if (name) {
+        if (type &amp;&amp; name) {
-            query += ` AND name = ?`;
+            return this.__ownedAttributeCache.filter(attr => attr.type === type &amp;&amp; attr.name === name);
-            params.push(name);
+        }
        else if (type) {
            return this.__ownedAttributeCache.filter(attr => attr.type === type);
        }
        else if (name) {
            return this.__ownedAttributeCache.filter(attr => attr.name === name);
        }
        else {
            return this.__ownedAttributeCache.slice();
        }
        return await repository.getEntities(query, params);
    }
    /**
@@ -262,19 +283,26 @@ class Note extends Entity {
    }
    /**
-     * @param {string} [name] - attribute name to filter
+     * @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
     */
-    async getAttributes(name) {
+    async getAttributes(type, name) {
        if (!this.__attributeCache) {
            await this.loadAttributesToCache();
        }
-        if (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;
+            return this.__attributeCache.slice();
        }
    }
@@ -283,7 +311,15 @@ class Note extends Entity {
     * @returns {Promise&lt;Attribute[]>} all note's labels (attributes with type label), including inherited ones
     */
    async getLabels(name) {
-        return (await this.getAttributes(name)).filter(attr => attr.type === LABEL);
+        return await this.getAttributes(LABEL, name);
    }
    /**
     * @param {string} [name] - label name to filter
     * @returns {Promise&lt;Attribute[]>} all note's labels (attributes with type label), excluding inherited ones
     */
    async getOwnedLabels(name) {
        return await this.getOwnedAttributes(LABEL, name);
    }
    /**
@@ -291,7 +327,7 @@ class Note extends Entity {
     * @returns {Promise&lt;Attribute[]>} all note's label definitions, including inherited ones
     */
    async getLabelDefinitions(name) {
-        return (await this.getAttributes(name)).filter(attr => attr.type === LABEL_DEFINITION);
+        return await this.getAttributes(LABEL_DEFINITION, name);
    }
    /**
@@ -299,7 +335,15 @@ class Note extends Entity {
     * @returns {Promise&lt;Attribute[]>} all note's relations (attributes with type relation), including inherited ones
     */
    async getRelations(name) {
-        return (await this.getAttributes(name)).filter(attr => attr.type === RELATION);
+        return await this.getAttributes(RELATION, name);
    }
    /**
     * @param {string} [name] - relation name to filter
     * @returns {Promise&lt;Attribute[]>} all note's relations (attributes with type relation), excluding inherited ones
     */
    async getOwnedRelations(name) {
        return await this.getOwnedAttributes(RELATION, name);
    }
    /**
@@ -322,7 +366,7 @@ class Note extends Entity {
     * @returns {Promise&lt;Attribute[]>} all note's relation definitions including inherited ones
     */
    async getRelationDefinitions(name) {
-        return (await this.getAttributes(name)).filter(attr => attr.type === RELATION_DEFINITION);
+        return await this.getAttributes(RELATION_DEFINITION, name);
    }
    /**
@@ -331,6 +375,7 @@ class Note extends Entity {
     */
    invalidateAttributeCache() {
        this.__attributeCache = null;
        this.__ownedAttributeCache = null;
    }
    /** @returns {Promise&lt;void>} */
@@ -340,11 +385,10 @@ class Note extends Entity {
            tree(noteId, level) AS (
                SELECT ?, 0
                UNION
-                SELECT branches.parentNoteId, tree.level + 1 FROM branches
+                SELECT branches.parentNoteId, tree.level + 1 
                    FROM branches
                    JOIN tree ON branches.noteId = tree.noteId
-                    JOIN notes ON notes.noteId = branches.parentNoteId
+                WHERE branches.isDeleted = 0
                WHERE notes.isDeleted = 0
                  AND branches.isDeleted = 0
            ),
            treeWithAttrs(noteId, level) AS (
                SELECT * FROM tree
@@ -363,6 +407,11 @@ class Note extends Entity {
        // we order by noteId so that attributes from same note stay together. Actual noteId ordering doesn't matter.
        const filteredAttributes = attributes.filter((attr, index) => {
            // if this exact attribute already appears then don't include it (can happen via cloning)
            if (attributes.findIndex(it => it.attributeId === attr.attributeId) !== index) {
                return false;
            }
            if (attr.isDefinition()) {
                const firstDefinitionIndex = attributes.findIndex(el => el.type === attr.type &amp;&amp; el.name === attr.name);
@@ -406,6 +455,15 @@ class Note extends Entity {
        return !!await this.getAttribute(type, 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 (excluding inherited)
     */
    async hasOwnedAttribute(type, name) {
        return !!await this.getOwnedAttribute(type, name);
    }
    /**
     * @param {string} type - attribute type (label, relation, etc.)
     * @param {string} name - attribute name
@@ -420,7 +478,7 @@ class Note extends Entity {
    /**
     * @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 {Promise&lt;string|null>} attribute value of given type and name or null if no such attribute exists.
     */
    async getAttributeValue(type, name) {
        const attr = await this.getAttribute(type, name);
@@ -428,6 +486,17 @@ class Note extends Entity {
        return attr ? attr.value : null;
    }
    /**
     * @param {string} type - attribute type (label, relation, etc.)
     * @param {string} name - attribute name
     * @returns {Promise&lt;string|null>} attribute value of given type and name or null if no such attribute exists.
     */
    async getOwnedAttributeValue(type, name) {
        const attr = await this.getOwnedAttribute(type, name);
        return attr ? attr.value : null;
    }
    /**
     * Based on enabled, attribute is either set or removed.
     *
@@ -447,7 +516,7 @@ class Note extends Entity {
    }
    /**
-     * Creates given attribute name-value pair if it doesn't exist.
+     * Update's given attribute's value or creates it if it doesn't exist
     *
     * @param {string} type - attribute type (label, relation, etc.)
     * @param {string} name - attribute name
@@ -455,10 +524,18 @@ class Note extends Entity {
     * @returns {Promise&lt;void>}
     */
    async setAttribute(type, name, value) {
-        const attributes = await this.getOwnedAttributes();
+        const attributes = await this.loadOwnedAttributesToCache();
-        let attr = attributes.find(attr => attr.type === type &amp;&amp; (value === undefined || attr.value === value));
+        let attr = attributes.find(attr => attr.type === type &amp;&amp; attr.name === name);
-        if (!attr) {
+        if (attr) {
            if (attr.value !== value) {
                attr.value = value;
                await attr.save();
                this.invalidateAttributeCache();
            }
        }
        else {
            attr = new Attribute({
                noteId: this.noteId,
                type: type,
@@ -481,10 +558,10 @@ class Note extends Entity {
     * @returns {Promise&lt;void>}
     */
    async removeAttribute(type, name, value) {
-        const attributes = await this.getOwnedAttributes();
+        const attributes = await this.loadOwnedAttributesToCache();
        for (const attribute of attributes) {
-            if (attribute.type === type &amp;&amp; (value === undefined || value === attribute.value)) {
+            if (attribute.type === type &amp;&amp; attribute.name === name &amp;&amp; (value === undefined || value === attribute.value)) {
                attribute.isDeleted = true;
                await attribute.save();
@@ -493,42 +570,104 @@ class Note extends Entity {
        }
    }
    /**
     * @return {Promise&lt;Attribute>}
     */
    async addAttribute(type, name, value = "") {
        const attr = new Attribute({
            noteId: this.noteId,
            type: type,
            name: name,
            value: value
        });
        await attr.save();
        this.invalidateAttributeCache();
        return attr;
    }
    async addLabel(name, value = "") {
        return await this.addAttribute(LABEL, name, value);
    }
    async addRelation(name, targetNoteId) {
        return await this.addAttribute(RELATION, name, targetNoteId);
    }
    /**
     * @param {string} name - label name
     * @returns {Promise&lt;boolean>} true if label exists (including inherited)
     */
    async hasLabel(name) { return await this.hasAttribute(LABEL, name); }
    /**
     * @param {string} name - label name
     * @returns {Promise&lt;boolean>} true if label exists (excluding inherited)
     */
    async hasOwnedLabel(name) { return await this.hasOwnedAttribute(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); }
    /**
     * @param {string} name - relation name
     * @returns {Promise&lt;boolean>} true if relation exists (excluding inherited)
     */
    async hasOwnedRelation(name) { return await this.hasOwnedAttribute(RELATION, name); }
    /**
     * @param {string} name - label name
-     * @returns {Promise&lt;Attribute>} label if it exists, null otherwise
+     * @returns {Promise&lt;Attribute|null>} label if it exists, null otherwise
     */
    async getLabel(name) { return await this.getAttribute(LABEL, name); }
    /**
     * @param {string} name - label name
     * @returns {Promise&lt;Attribute|null>} label if it exists, null otherwise
     */
    async getOwnedLabel(name) { return await this.getOwnedAttribute(LABEL, name); }
    /**
     * @param {string} name - relation name
-     * @returns {Promise&lt;Attribute>} relation if it exists, null otherwise
+     * @returns {Promise&lt;Attribute|null>} relation if it exists, null otherwise
     */
    async getRelation(name) { return await this.getAttribute(RELATION, name); }
    /**
     * @param {string} name - relation name
     * @returns {Promise&lt;Attribute|null>} relation if it exists, null otherwise
     */
    async getOwnedRelation(name) { return await this.getOwnedAttribute(RELATION, name); }
    /**
     * @param {string} name - label name
-     * @returns {Promise&lt;string>} label value if label exists, null otherwise
+     * @returns {Promise&lt;string|null>} label value if label exists, null otherwise
     */
    async getLabelValue(name) { return await this.getAttributeValue(LABEL, name); }
    /**
     * @param {string} name - label name
     * @returns {Promise&lt;string|null>} label value if label exists, null otherwise
     */
    async getOwnedLabelValue(name) { return await this.getOwnedAttributeValue(LABEL, name); }
    /**
     * @param {string} name - relation name
-     * @returns {Promise&lt;string>} relation value if relation exists, null otherwise
+     * @returns {Promise&lt;string|null>} relation value if relation exists, null otherwise
     */
    async getRelationValue(name) { return await this.getAttributeValue(RELATION, name); }
    /**
     * @param {string} name - relation name
     * @returns {Promise&lt;string|null>} relation value if relation exists, null otherwise
     */
    async getOwnedRelationValue(name) { return await this.getOwnedAttributeValue(RELATION, name); }
    /**
     * @param {string} name
     * @returns {Promise&lt;Note>|null} target note of the relation or null (if target is empty or note was not found)
@@ -539,6 +678,16 @@ class Note extends Entity {
        return relation ? await repository.getNote(relation.value) : null;
    }
    /**
     * @param {string} name
     * @returns {Promise&lt;Note>|null} target note of the relation or null (if target is empty or note was not found)
     */
    async getOwnedRelationTarget(name) {
        const relation = await this.getOwnedRelation(name);
        return relation ? await repository.getNote(relation.value) : null;
    }
    /**
     * Based on enabled, label is either set or removed.
     *
@@ -560,7 +709,7 @@ class Note extends Entity {
    async toggleRelation(enabled, name, value) { return await this.toggleAttribute(RELATION, enabled, name, value); }
    /**
-     * Create label name-value pair if it doesn't exist yet.
+     * Update's given label's value or creates it if it doesn't exist
     *
     * @param {string} name - label name
     * @param {string} [value] - label value
@@ -569,7 +718,7 @@ class Note extends Entity {
    async setLabel(name, value) { return await this.setAttribute(LABEL, name, value); }
    /**
-     * Create relation name-value pair if it doesn't exist yet.
+     * Update's given relation's value or creates it if it doesn't exist
     *
     * @param {string} name - relation name
     * @param {string} [value] - relation value (noteId)
@@ -690,9 +839,9 @@ class Note extends Entity {
            SELECT * 
            FROM attributes 
            WHERE noteId = ? AND 
-                  isDeleted = 0 AND 
+                  isDeleted = 0 AND
-                  type = 'relation' AND 
+                  type = 'relation' AND
-                  name IN ('internal-link', 'image-link', 'relation-map-link')`, [this.noteId]);
+                  name IN ('internalLink', 'imageLink', 'relationMapLink', 'includeNoteLink')`, [this.noteId]);
    }
    /**
@@ -749,6 +898,36 @@ class Note extends Entity {
                AND parent_notes.isDeleted = 0`, [this.noteId]);
    }
    /**
     * @return {Promise&lt;string[][]>} - array of notePaths (each represented by array of noteIds constituting the particular note path)
     */
    async getAllNotePaths() {
        if (this.noteId === 'root') {
            return [['root']];
        }
        const notePaths = [];
        for (const parentNote of await this.getParentNotes()) {
            for (const parentPath of await parentNote.getAllNotePaths()) {
                parentPath.push(this.noteId);
                notePaths.push(parentPath);
            }
        }
        return notePaths;
    }
    /**
     * @param ancestorNoteId
     * @return {Promise&lt;boolean>} - true if ancestorNoteId occurs in at least one of the note's paths
     */
    async isDescendantOfNote(ancestorNoteId) {
        const notePaths = await this.getAllNotePaths();
        return notePaths.some(path => path.includes(ancestorNoteId));
    }
    beforeSaving() {
        if (!this.isDeleted) {
            this.isDeleted = false;
@@ -762,6 +941,10 @@ class Note extends Entity {
            this.utcDateCreated = dateUtils.utcNowDateTime();
        }
        if (this.contentLength === undefined) {
            this.contentLength = -1;
        }
        super.beforeSaving();
        if (this.isChanged) {
@@ -774,7 +957,7 @@ class Note extends Entity {
    updatePojo(pojo) {
        if (pojo.isProtected) {
            if (this.isContentAvailable) {
-                protectedSessionService.encryptNote(pojo);
+                pojo.title = protectedSessionService.encrypt(pojo.title);
            }
            else {
                // updating protected note outside of protected session means we will keep original ciphertexts
@@ -784,7 +967,9 @@ class Note extends Entity {
        delete pojo.isContentAvailable;
        delete pojo.__attributeCache;
        delete pojo.__ownedAttributeCache;
        delete pojo.content;
        /** zero references to contentHash, probably can be removed */
        delete pojo.contentHash;
    }
 }
@@ -805,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
@@ -31,28 +31,34 @@
 const Entity = require('./entity');
 const protectedSessionService = require('../services/protected_session');
 const repository = require('../services/repository');
 const utils = require('../services/utils');
 const sql = require('../services/sql');
 const dateUtils = require('../services/date_utils');
 const syncTableService = require('../services/sync_table');
 /**
 * NoteRevision represents snapshot of note's title and content at some point in the past. It's used for seamless note versioning.
 *
- * @param {string} noteRevisionId
+ * @property {string} noteRevisionId
- * @param {string} noteId
+ * @property {string} noteId
- * @param {string} type
+ * @property {string} type
- * @param {string} mime
+ * @property {string} mime
- * @param {string} title
+ * @property {string} title
- * @param {string} content
+ * @property {int} contentLength
- * @param {string} isProtected
+ * @property {boolean} isErased
- * @param {string} dateModifiedFrom
+ * @property {boolean} isProtected
- * @param {string} dateModifiedTo
+ * @property {string} dateLastEdited
- * @param {string} utcDateModifiedFrom
+ * @property {string} dateCreated
- * @param {string} utcDateModifiedTo
+ * @property {string} utcDateLastEdited
 * @property {string} utcDateCreated
 * @property {string} utcDateModified
 *
 * @extends Entity
 */
 class NoteRevision extends Entity {
    static get entityName() { return "note_revisions"; }
    static get primaryKeyName() { return "noteRevisionId"; }
-    static get hashedProperties() { return ["noteRevisionId", "noteId", "title", "content", "isProtected", "dateModifiedFrom", "dateModifiedTo", "utcDateModifiedFrom", "utcDateModifiedTo"]; }
+    static get hashedProperties() { return ["noteRevisionId", "noteId", "title", "contentLength", "isErased", "isProtected", "dateLastEdited", "dateCreated", "utcDateLastEdited", "utcDateCreated", "utcDateModified"]; }
    constructor(row) {
        super(row);
@@ -60,20 +66,120 @@ class NoteRevision extends Entity {
        this.isProtected = !!this.isProtected;
        if (this.isProtected) {
-            protectedSessionService.decryptNoteRevision(this);
+            if (protectedSessionService.isProtectedSessionAvailable()) {
                this.title = protectedSessionService.decryptString(this.title);
            }
            else {
                this.title = "[Protected]";
            }
        }
    }
    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) */
    isStringNote() {
        return utils.isStringNote(this.type, this.mime);
    }
    /*
     * Note revision content has quite special handling - it's not a separate entity, but a lazily loaded
     * part of NoteRevision entity with it's own sync. Reason behind this hybrid design is that
     * content can be quite large and it's not necessary to load it / fill memory for any note access even
     * if we don't need a content, especially for bulk operations like search.
     *
     * This is the same approach as is used for Note's content.
     */
    /** @returns {Promise&lt;*>} */
    async getContent(silentNotFoundError = false) {
        if (this.content === undefined) {
            const res = await sql.getRow(`SELECT content, hash FROM note_revision_contents WHERE noteRevisionId = ?`, [this.noteRevisionId]);
            if (!res) {
                if (silentNotFoundError) {
                    return undefined;
                }
                else {
                    throw new Error("Cannot find note revision content for noteRevisionId=" + this.noteRevisionId);
                }
            }
            this.content = res.content;
            if (this.isProtected) {
                if (protectedSessionService.isProtectedSessionAvailable()) {
                    this.content = protectedSessionService.decrypt(this.content);
                }
                else {
                    this.content = "";
                }
            }
        }
        if (this.isStringNote()) {
            return this.content === null
                ? ""
                : this.content.toString("UTF-8");
        }
        else {
            return this.content;
        }
    }
    /** @returns {Promise} */
    async setContent(content) {
        // force updating note itself so that utcDateModified is represented correctly even for the content
        this.forcedChange = true;
        this.contentLength = content === null ? 0 : content.length;
        await this.save();
        this.content = content;
        const pojo = {
            noteRevisionId: this.noteRevisionId,
            content: content,
            utcDateModified: dateUtils.utcNowDateTime(),
            hash: utils.hash(this.noteRevisionId + "|" + content)
        };
        if (this.isProtected) {
            if (protectedSessionService.isProtectedSessionAvailable()) {
                pojo.content = protectedSessionService.encrypt(pojo.content);
            }
            else {
                throw new Error(`Cannot update content of noteRevisionId=${this.noteRevisionId} since we're out of protected session.`);
            }
        }
        await sql.upsert("note_revision_contents", "noteRevisionId", pojo);
        await syncTableService.addNoteRevisionContentSync(this.noteRevisionId);
    }
    beforeSaving() {
-        if (this.isProtected) {
+        super.beforeSaving();
-            protectedSessionService.encryptNoteRevision(this);
+
        if (this.isChanged) {
            this.utcDateModified = dateUtils.utcNowDateTime();
        }
    }
    // cannot be static!
    updatePojo(pojo) {
        if (pojo.isProtected) {
            if (protectedSessionService.isProtectedSessionAvailable()) {
                pojo.title = protectedSessionService.encrypt(pojo.title);
            }
            else {
                // updating protected note outside of protected session means we will keep original ciphertexts
                delete pojo.title;
            }
        }
-        super.beforeSaving();
+        delete pojo.content;
    }
 }
@@ -93,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
@@ -34,11 +34,11 @@ const dateUtils = require('../services/date_utils');
 /**
 * Option represents name-value pair, either directly configurable by the user or some system property.
 *
- * @param {string} name
+ * @property {string} name
- * @param {string} value
+ * @property {string} value
- * @param {boolean} isSynced
+ * @property {boolean} isSynced
- * @param {string} utcDateModified
+ * @property {string} utcDateModified
- * @param {string} utcDateCreated
+ * @property {string} utcDateCreated
 *
 * @extends Entity
 */
@@ -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
@@ -34,10 +34,10 @@ const dateUtils = require('../services/date_utils');
 /**
 * RecentNote represents recently visited note.
 *
- * @param {string} noteId
+ * @property {string} noteId
- * @param {string} notePath
+ * @property {string} notePath
- * @param {boolean} isDeleted
+ * @property {boolean} isDeleted
- * @param {string} utcDateModified
+ * @property {string} utcDateModified
 *
 * @extends Entity
 */
@@ -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
@@ -102,6 +102,313 @@
 <h4 class="name" id="CreateNewNoteParams">CreateNewNoteParams</h4>
    <h5>Type:</h5>
    <ul>
        <li>
 <span class="param-type">object</span>
        </li>
    </ul>
    <h5 class="subsection-title">Properties:</h5>
 <table class="props">
    <thead>
    <tr>
        <th>Name</th>
        <th>Type</th>
        <th class="last">Description</th>
    </tr>
    </thead>
    <tbody>
        <tr>
                <td class="name"><code>parentNoteId</code></td>
            <td class="type">
 <span class="param-type">string</span>
            </td>
            <td class="description last">MANDATORY</td>
        </tr>
        <tr>
                <td class="name"><code>title</code></td>
            <td class="type">
 <span class="param-type">string</span>
            </td>
            <td class="description last">MANDATORY</td>
        </tr>
        <tr>
                <td class="name"><code>content</code></td>
            <td class="type">
 <span class="param-type">string</span>
 |
 <span class="param-type">buffer</span>
            </td>
            <td class="description last">MANDATORY</td>
        </tr>
        <tr>
                <td class="name"><code>type</code></td>
            <td class="type">
 <span class="param-type">string</span>
            </td>
            <td class="description last">text, code, file, image, search, book, relation-map - MANDATORY</td>
        </tr>
        <tr>
                <td class="name"><code>mime</code></td>
            <td class="type">
 <span class="param-type">string</span>
            </td>
            <td class="description last">value is derived from default mimes for type</td>
        </tr>
        <tr>
                <td class="name"><code>isProtected</code></td>
            <td class="type">
 <span class="param-type">boolean</span>
            </td>
            <td class="description last">default is false</td>
        </tr>
        <tr>
                <td class="name"><code>isExpanded</code></td>
            <td class="type">
 <span class="param-type">boolean</span>
            </td>
            <td class="description last">default is false</td>
        </tr>
        <tr>
                <td class="name"><code>prefix</code></td>
            <td class="type">
 <span class="param-type">string</span>
            </td>
            <td class="description last">default is empty string</td>
        </tr>
        <tr>
                <td class="name"><code>notePosition</code></td>
            <td class="type">
 <span class="param-type">int</span>
            </td>
            <td class="description last">default is last existing notePosition in a parent + 10</td>
        </tr>
    </tbody>
 </table>
 <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#line212">line 212</a>
    </li></ul></dd>
 </dl>
 <h4 class="name" id="CreateNoteAttribute">CreateNoteAttribute</h4>
@@ -290,6 +597,194 @@
 <h4 class="name" id="CreateNoteAttribute">CreateNoteAttribute</h4>
    <h5>Type:</h5>
    <ul>
        <li>
 <span class="param-type">object</span>
        </li>
    </ul>
    <h5 class="subsection-title">Properties:</h5>
 <table class="props">
    <thead>
    <tr>
        <th>Name</th>
        <th>Type</th>
        <th>Attributes</th>
        <th class="last">Description</th>
    </tr>
    </thead>
    <tbody>
        <tr>
                <td class="name"><code>type</code></td>
            <td class="type">
 <span class="param-type">string</span>
            </td>
                <td class="attributes">
                </td>
            <td class="description last">attribute type - label, relation etc.</td>
        </tr>
        <tr>
                <td class="name"><code>name</code></td>
            <td class="type">
 <span class="param-type">string</span>
            </td>
                <td class="attributes">
                </td>
            <td class="description last">attribute name</td>
        </tr>
        <tr>
                <td class="name"><code>value</code></td>
            <td class="type">
 <span class="param-type">string</span>
            </td>
                <td class="attributes">
                    &lt;optional><br>
                </td>
            <td class="description last">attribute value</td>
        </tr>
    </tbody>
 </table>
 <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#line233">line 233</a>
    </li></ul></dd>
 </dl>
 <h4 class="name" id="CreateNoteExtraOptions">CreateNoteExtraOptions</h4>
@@ -558,7 +1053,7 @@
    <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#line180">line 180</a>
+        <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line240">line 240</a>
    </li></ul></dd>
@@ -594,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
@@ -198,6 +198,66 @@ function BackendScriptApi(currentNote, apiParams) {
     */
    this.toggleNoteInParent = cloningService.toggleNoteInParent;
    /**
     * @typedef {object} CreateNoteAttribute
     * @property {string} type - attribute type - label, relation etc.
     * @property {string} name - attribute name
     * @property {string} [value] - attribute value
     */
    /**
     * Create text note. See also createNewNote() for more options.
     *
     * @param {string} parentNoteId
     * @param {string} title
     * @param {string} content
     * @return {Promise&lt;{note: Note, branch: Branch}>}
     */
    this.createTextNote = async (parentNoteId, title, content = '') => await noteService.createNewNote({
        parentNoteId,
        title,
        content,
        type: 'text'
    });
    /**
     * Create data note - data in this context means object serializable to JSON. Created note will be of type 'code' and
     * JSON MIME type. See also createNewNote() for more options.
     *
     * @param {string} parentNoteId
     * @param {string} title
     * @param {object} content
     * @return {Promise&lt;{note: Note, branch: Branch}>}
     */
    this.createDataNote = async (parentNoteId, title, content = {}) => await noteService.createNewNote({
        parentNoteId,
        title,
        content: JSON.stringify(content, null, '\t'),
        type: 'code',
        mime: 'application/json'
    });
    /**
     * @typedef {object} CreateNewNoteParams
     * @property {string} parentNoteId - MANDATORY
     * @property {string} title - MANDATORY
     * @property {string|buffer} content - MANDATORY
     * @property {string} type - text, code, file, image, search, book, relation-map - MANDATORY
     * @property {string} mime - value is derived from default mimes for type
     * @property {boolean} isProtected - default is false
     * @property {boolean} isExpanded - default is false
     * @property {string} prefix - default is empty string
     * @property {int} notePosition - default is last existing notePosition in a parent + 10
     */
    /**
     * @method
     *
     * @param {CreateNewNoteParams} [params]
     * @returns {Promise&lt;{note: Note, branch: Branch}>} object contains newly created entities note and branch
     */
    this.createNewNote = noteService.createNewNote;
    /**
     * @typedef {object} CreateNoteAttribute
     * @property {string} type - attribute type - label, relation etc.
@@ -216,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
@@ -223,25 +284,38 @@ function BackendScriptApi(currentNote, apiParams) {
     * @param {CreateNoteExtraOptions} [extraOptions={}]
     * @returns {Promise&lt;{note: Note, branch: Branch}>} object contains newly created entities note and branch
     */
-    this.createNote = noteService.createNote;
+    this.createNote = async (parentNoteId, title, content = "", extraOptions= {}) => {
        extraOptions.parentNoteId = parentNoteId;
        extraOptions.title = title;
-    /**
+        const parentNote = await repository.getNote(parentNoteId);
     * Creates new note according to given params and force all connected clients to refresh their tree.
     *
     * @method
     *
     * @param {string} parentNoteId - create new note under this parent
     * @param {string} title
     * @param {string} [content=""]
     * @param {CreateNoteExtraOptions} [extraOptions={}]
     * @returns {Promise&lt;{note: Note, branch: Branch}>} object contains newly created entities note and branch
     */
    this.createNoteAndRefresh = async function(parentNoteId, title, content, extraOptions) {
        const ret = await noteService.createNote(parentNoteId, title, content, extraOptions);
-        ws.refreshTree();
+        // code note type can be inherited, otherwise text is default
-        
+        extraOptions.type = parentNote.type === 'code' ? 'code' : 'text';
-        return ret;
+        extraOptions.mime = parentNote.type === 'code' ? parentNote.mime : 'text/html';
        if (extraOptions.json) {
            extraOptions.content = JSON.stringify(content || {}, null, '\t');
            extraOptions.type = 'code';
            extraOptions.mime = 'application/json';
        }
        else {
            extraOptions.content = content;
        }
        const {note, branch} = await noteService.createNewNote(extraOptions);
        for (const attr of extraOptions.attributes || []) {
            await attributeService.createAttribute({
                noteId: note.noteId,
                type: attr.type,
                name: attr.name,
                value: attr.value,
                isInheritable: !!attr.isInheritable
            });
        }
        return {note, branch};
    };
    /**
@@ -268,6 +342,14 @@ function BackendScriptApi(currentNote, apiParams) {
     */
    this.getDateNote = dateNoteService.getDateNote;
    /**
     * Returns today's day note. If such note doesn't exist, it is created.
     *
     * @method
     * @returns {Promise&lt;Note|null>}
     */
    this.getTodayNote = dateNoteService.getTodayNote;
    /**
     * Returns note for the first date of the week of the given date.
     *
@@ -310,9 +392,10 @@ function BackendScriptApi(currentNote, apiParams) {
     * This method looks similar to toggleNoteInParent() but differs because we're looking up branch by prefix.
     *
     * @method
     * @deprecated - this method is pretty confusing and serves specialized purpose only
     * @param {string} noteId
     * @param {string} prefix
-     * @param {string} [parentNoteId]
+     * @param {string|null} parentNoteId
     */
    this.setNoteToParent = treeService.setNoteToParent;
@@ -332,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
+     * @method
-     * the backend.
+     * @deprecated - this is now no-op since all the changes should be gracefully handled per widget
     *
     * @returns {Promise&lt;void>}
     */
-    this.refreshTree = ws.refreshTree;
+    this.refreshTree = () => {};
    /**
     * @return {{syncVersion, appVersion, buildRevision, dbVersion, dataDirectory, buildDate}|*} - object representing basic info about running Trilium version
@@ -362,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#line17">line 17</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#line13">line 13</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#line11">line 11</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#line15">line 15</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#line21">line 21</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#line26">line 26</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/KeyboardAction.html
+++ b/docs/frontend_api/KeyboardAction.html
--- a/docs/frontend_api/KeyboardActions.html
+++ b/docs/frontend_api/KeyboardActions.html
@@ -0,0 +1,280 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
    <meta charset="utf-8">
    <title>JSDoc: Class: KeyboardActions</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: KeyboardActions</h1>
 <section>
 <header>
        <h2><span class="attribs"><span class="type-signature"></span></span>KeyboardActions<span class="signature">()</span><span class="type-signature"></span></h2>
            <div class="class-description">blaa vlaa</div>
 </header>
 <article>
    <div class="container-overview">
    <h2>Constructor</h2>
    <h4 class="name" id="KeyboardActions"><span class="type-signature"></span>new KeyboardActions<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="services_keyboard_actions.js.html">services/keyboard_action.js</a>, <a href="services_keyboard_actions.js.html#line5">line 5</a>
    </li></ul></dd>
 </dl>
    </div>
        <h3 class="subsection-title">Members</h3>
 <h4 class="name" id="JUMP_TO"><span class="type-signature"></span>JUMP_TO<span class="type-signature"></span></h4>
    <h5 class="subsection-title">Properties:</h5>
 <table class="props">
    <thead>
    <tr>
        <th>Type</th>
        <th class="last">Description</th>
    </tr>
    </thead>
    <tbody>
        <tr>
            <td class="type">
 <span class="param-type">string</span>
            </td>
            <td class="description last"></td>
        </tr>
    </tbody>
 </table>
 <dl class="details">
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
        <a href="services_keyboard_actions.js.html">services/keyboard_action.js</a>, <a href="services_keyboard_actions.js.html#line7">line 7</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="KeyboardActions.html">KeyboardActions</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>
 </nav>
 <br class="clear">
 <footer>
    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.3</a>
 </footer>
 <script> prettyPrint(); </script>
 <script src="scripts/linenumber.js"> </script>
 </body>
 </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,11 +30,15 @@
 class Branch {
    constructor(treeCache, row) {
        this.treeCache = treeCache;
        this.update(row);
    }
    update(row) {
        /** @param {string} primary key */
        this.branchId = row.branchId;
        /** @param {string} */
        this.noteId = row.noteId;
        this.note = null;
        /** @param {string} */
        this.parentNoteId = row.parentNoteId;
        /** @param {int} */
@@ -43,11 +47,18 @@ class Branch {
        this.prefix = row.prefix;
        /** @param {boolean} */
        this.isExpanded = !!row.isExpanded;
        /** @param {boolean} */
        this.isDeleted = !!row.isDeleted;
    }
    /** @returns {NoteShort} */
    async getNote() {
-        return await this.treeCache.getNote(this.noteId);
+        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 */
@@ -70,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
@@ -28,7 +28,6 @@
        <article>
            <pre class="prettyprint source linenums"><code>import server from '../services/server.js';
 import Attribute from './attribute.js';
 import branches from "../services/branches.js";
 const LABEL = 'label';
 const LABEL_DEFINITION = 'label-definition';
@@ -36,33 +35,21 @@ const RELATION = 'relation';
 const RELATION_DEFINITION = 'relation-definition';
 /**
 * FIXME: rethink how attributes are cached in Note entities since they are long lived inside the cache.
 * Attribute cache should be limited to "transaction".
 *
 * This note's representation is used in note tree and is kept in TreeCache.
 */
 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;
+        /** @type {string[]} */
-        /** @param {string} */
+        this.attributes = [];
-        this.title = row.title;
+
-        /** @param {boolean} */
+        /** @type {string[]} */
-        this.isProtected = row.isProtected;
+        this.targetRelations = [];
        /** @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.archived = row.archived;
        /** @param {string} */
        this.cssClass = row.cssClass;
        /** @type {string[]} */
        this.parents = [];
@@ -75,19 +62,24 @@ class NoteShort {
        /** @type {Object.&lt;string, string>} */
        this.childToBranch = {};
-        for (const branch of branches) {
+        this.update(row);
-            if (this.noteId === branch.noteId) {
+    }
-                this.parents.push(branch.parentNoteId);
+
-                this.parentToBranch[branch.parentNoteId] = branch.branchId;
+    update(row) {
-            }
+        /** @param {string} */
-            else if (this.noteId === branch.parentNoteId) {
+        this.noteId = row.noteId;
-                this.children.push(branch.noteId);
+        /** @param {string} */
-                this.childToBranch[branch.noteId] = branch.branchId;
+        this.title = row.title;
-            }
+        /** @param {int} */
-            else {
+        this.contentLength = row.contentLength;
-                throw new Error(`Unknown branch ${branch.branchId} for note ${this.noteId}`);
+        /** @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) {
@@ -108,7 +100,7 @@ class NoteShort {
        const branchIdPos = {};
        for (const branchId of Object.values(this.childToBranch)) {
-            branchIdPos[branchId] = this.treeCache.branches[branchId].notePosition;
+            branchIdPos[branchId] = this.treeCache.getBranch(branchId).notePosition;
        }
        this.children.sort((a, b) => branchIdPos[this.childToBranch[a]] &lt; branchIdPos[this.childToBranch[b]] ? -1 : 1);
@@ -139,8 +131,13 @@ class NoteShort {
        }
    }
-    /** @returns {Promise&lt;Branch[]>} */
+    /** @returns {string[]} */
-    async getBranches() {
+    getBranchIds() {
        return Object.values(this.parentToBranch);
    }
    /** @returns {Branch[]} */
    getBranches() {
        const branchIds = Object.values(this.parentToBranch);
        return this.treeCache.getBranches(branchIds);
@@ -151,9 +148,10 @@ class NoteShort {
        return this.children.length > 0;
    }
-    /** @returns {Promise&lt;Branch[]>} */
+    /** @returns {Branch[]} */
-    async getChildBranches() {
+    getChildBranches() {
-        const branchIds = Object.values(this.childToBranch);
+        // don't use Object.values() to guarantee order
        const branchIds = this.children.map(childNoteId => this.childToBranch[childNoteId]);
        return this.treeCache.getBranches(branchIds);
    }
@@ -163,9 +161,9 @@ class NoteShort {
        return this.parents;
    }
-    /** @returns {Promise&lt;NoteShort[]>} */
+    /** @returns {NoteShort[]} */
-    async getParentNotes() {
+    getParentNotes() {
-        return await this.treeCache.getNotes(this.parents);
+        return this.treeCache.getNotesFromCache(this.parents);
    }
    /** @returns {string[]} */
@@ -179,121 +177,251 @@ class NoteShort {
    }
    /**
-     * @param {string} [name] - attribute name to filter
+     * @param {string} [type] - (optional) attribute type to filter
-     * @returns {Promise&lt;Attribute[]>}
+     * @param {string} [name] - (optional) attribute name to filter
     * @returns {Attribute[]} all note's attributes, including inherited ones
     */
-    async getAttributes(name) {
+    getOwnedAttributes(type, name) {
-        if (!this.attributeCache) {
+        const attrs = this.attributes
-            this.attributeCache = (await server.get('notes/' + this.noteId + '/attributes'))
+            .map(attributeId => this.treeCache.attributes[attributeId])
-                .map(attrRow => new Attribute(this.treeCache, attrRow));
+            .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 (name) {
+        if (this.noteId !== 'root') {
-            return this.attributeCache.filter(attr => attr.name === name);
+            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());
                }
            }
        }
-        else {
+
-            return this.attributeCache;
+        const attributes = attrArrs.flat();
        return this.__filterAttrs(attributes, type, name);
    }
    __filterAttrs(attributes, type, name) {
        if (type &amp;&amp; name) {
            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) {
+    getOwnedLabels(name) {
-        return (await this.getAttributes(name)).filter(attr => attr.type === LABEL);
+        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) {
+    getLabels(name) {
-        return (await this.getAttributes(name)).filter(attr => attr.type === LABEL_DEFINITION);
+        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) {
+    getOwnedRelations(name) {
-        return (await this.getAttributes(name)).filter(attr => attr.type === RELATION);
+        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) {
+    getRelations(name) {
-        return (await this.getAttributes(name)).filter(attr => attr.type === RELATION_DEFINITION);
+        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) {
+    hasAttribute(type, name) {
-        return !!await this.getAttribute(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) {
+    hasOwnedAttribute(type, name) {
-        const attributes = await this.getAttributes();
+        return !!this.getOwnedAttribute(type, name);
        return attributes.find(attr => attr.type === type &amp;&amp; attr.name === 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) {
+    getOwnedAttribute(type, name) {
-        const attr = await this.getAttribute(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); }
+    hasOwnedLabel(name) { return this.hasOwnedAttribute(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); }
    /**
     * @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
@@ -310,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) {
@@ -325,17 +453,17 @@ class NoteShort {
     * Cache is note instance scoped.
     */
    invalidateAttributeCache() {
-        this.attributeCache = null;
+        this.__attributeCache = null;
    }
    /**
     * Get relations which target this note
     *
-     * @returns {Promise&lt;Attribute[]>}
+     * @returns {Attribute[]}
     */
-    async getTargetRelations() {
+    getTargetRelations() {
-        return (await server.get('notes/' + this.noteId + '/target-relations'))
+        return this.targetRelations
-            .map(attrRow => new Attribute(this.treeCache, attrRow));
+            .map(attributeId => this.treeCache.attributes[attributeId]);
    }
    get toString() {
@@ -345,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>
@@ -362,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>
@@ -204,7 +473,7 @@
-            <td class="description last">name of the JAM icon to be used (e.g. "clock" for "jam-clock" icon)</td>
+            <td class="description last">name of the boxicon to be used (e.g. "time" for "bx-time" icon)</td>
        </tr>
@@ -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/Show More
+++ b/Show More
		`@@ -0,0 +1,3 @@`
							`# These are supported funding model platforms`

							`github: [zadam]`
		`@@ -1,2 +0,0 @@`
			`#n:main`
			`!<md> [0, 0, null, null, -2147483648, -2147483648]`
		`@@ -0,0 +1 @@`
							`UPDATE notes SET contentLength = COALESCE((SELECT COALESCE(LENGTH(content), 0) FROM note_contents WHERE note_contents.noteId = notes.noteId), -1);`
		`@@ -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';`
		`@@ -0,0 +1 @@`
							`DELETE FROM options WHERE name = 'keyboardShortcutsActivateParentNote';`