diff --git a/apps/edit-docs/demo/!!!meta.json b/apps/edit-docs/demo/!!!meta.json
index 08835f72c..178f5bd51 100644
--- a/apps/edit-docs/demo/!!!meta.json
+++ b/apps/edit-docs/demo/!!!meta.json
@@ -226,13 +226,6 @@
 											"value": "_help_nBAXQFj20hS1",
 											"isInheritable": false,
 											"position": 10
-										},
-										{
-											"type": "relation",
-											"name": "includeNoteLink",
-											"value": "VsFbpoySMCE3",
-											"isInheritable": false,
-											"position": 20
 										}
 									],
 									"format": "html",
@@ -1666,43 +1659,7 @@
 															"isExpanded": false,
 															"type": "text",
 															"mime": "text/html",
-															"attributes": [
-																{
-																	"type": "relation",
-																	"name": "template",
-																	"value": "O9xYjAzeyT9O",
-																	"isInheritable": false,
-																	"position": 10
-																},
-																{
-																	"type": "label",
-																	"name": "link",
-																	"value": "https://www.amazon.com/Mechanical-Alchemy-Wars-Ian-Tregillis/dp/0316248002",
-																	"isInheritable": false,
-																	"position": 20
-																},
-																{
-																	"type": "label",
-																	"name": "author",
-																	"value": "Ian Tregillis",
-																	"isInheritable": false,
-																	"position": 30
-																},
-																{
-																	"type": "label",
-																	"name": "readingStart",
-																	"value": "2018-05-05",
-																	"isInheritable": false,
-																	"position": 40
-																},
-																{
-																	"type": "label",
-																	"name": "readingEnd",
-																	"value": "2018-05-23",
-																	"isInheritable": false,
-																	"position": 50
-																}
-															],
+															"attributes": [],
 															"format": "html",
 															"dataFileName": "The Mechanical.html",
 															"attachments": [],
@@ -4674,23 +4631,6 @@
 											"attachments": [],
 											"dirFileName": "TODO",
 											"children": [
-												{
-													"isClone": true,
-													"noteId": "1yhbjW4nlr4l",
-													"notePath": [
-														"root",
-														"rvaX6hEaQlmk",
-														"KZVWidxicAfn",
-														"JwXAb88VP2wn",
-														"pQFBLIQkRk7e",
-														"1yhbjW4nlr4l"
-													],
-													"title": "Send invites for christmas party",
-													"prefix": null,
-													"dataFileName": "Send invites for christmas party.clone.html",
-													"type": "text",
-													"format": "html"
-												},
 												{
 													"isClone": true,
 													"noteId": "jjeJHzHpi6ur",
@@ -4724,6 +4664,23 @@
 													"dataFileName": "Buy some book for Bob.clone.html",
 													"type": "text",
 													"format": "html"
+												},
+												{
+													"isClone": true,
+													"noteId": "1yhbjW4nlr4l",
+													"notePath": [
+														"root",
+														"rvaX6hEaQlmk",
+														"KZVWidxicAfn",
+														"JwXAb88VP2wn",
+														"pQFBLIQkRk7e",
+														"1yhbjW4nlr4l"
+													],
+													"title": "Send invites for christmas party",
+													"prefix": null,
+													"dataFileName": "Send invites for christmas party.clone.html",
+													"type": "text",
+													"format": "html"
 												}
 											]
 										},
@@ -5029,24 +4986,6 @@
 													"attachments": [],
 													"dirFileName": "shopping",
 													"children": [
-														{
-															"isClone": true,
-															"noteId": "Se4NJBgDXgDP",
-															"notePath": [
-																"root",
-																"rvaX6hEaQlmk",
-																"KZVWidxicAfn",
-																"JwXAb88VP2wn",
-																"6wvo0XkUPMIC",
-																"Zz5qaexattwb",
-																"Se4NJBgDXgDP"
-															],
-															"title": "Buy some book for Bob",
-															"prefix": null,
-															"dataFileName": "Buy some book for Bob.clone.html",
-															"type": "text",
-															"format": "html"
-														},
 														{
 															"isClone": true,
 															"noteId": "jjeJHzHpi6ur",
@@ -5064,6 +5003,24 @@
 															"dataFileName": "Buy milk.clone.html",
 															"type": "text",
 															"format": "html"
+														},
+														{
+															"isClone": true,
+															"noteId": "Se4NJBgDXgDP",
+															"notePath": [
+																"root",
+																"rvaX6hEaQlmk",
+																"KZVWidxicAfn",
+																"JwXAb88VP2wn",
+																"6wvo0XkUPMIC",
+																"Zz5qaexattwb",
+																"Se4NJBgDXgDP"
+															],
+															"title": "Buy some book for Bob",
+															"prefix": null,
+															"dataFileName": "Buy some book for Bob.clone.html",
+															"type": "text",
+															"format": "html"
 														}
 													]
 												},
@@ -5356,15 +5313,7 @@
 															"isExpanded": false,
 															"type": "file",
 															"mime": "text/javascript",
-															"attributes": [
-																{
-																	"type": "label",
-																	"name": "originalFileName",
-																	"value": "chart.min.js",
-																	"isInheritable": false,
-																	"position": 1
-																}
-															],
+															"attributes": [],
 															"dataFileName": "chart.js",
 															"attachments": []
 														}
diff --git a/apps/edit-docs/demo/navigation.html b/apps/edit-docs/demo/navigation.html
index 55bba6d58..ff2586927 100644
--- a/apps/edit-docs/demo/navigation.html
+++ b/apps/edit-docs/demo/navigation.html
@@ -438,15 +438,15 @@
                       </li>
                       <li>TODO
                         <ul>
-                          <li><a href="root/Trilium%20Demo/Scripting%20examples/Task%20manager/Locations/work/Send%20invites%20for%20christmas%20par.html"
-                            target="detail">Send invites for christmas party</a>
-                          </li>
                           <li><a href="root/Trilium%20Demo/Scripting%20examples/Task%20manager/Locations/tesco/Buy%20milk.html"
                             target="detail">Buy milk</a>
                           </li>
                           <li><a href="root/Trilium%20Demo/Scripting%20examples/Task%20manager/Locations/mall/Buy%20some%20book%20for%20Bob.html"
                             target="detail">Buy some book for Bob</a>
                           </li>
+                          <li><a href="root/Trilium%20Demo/Scripting%20examples/Task%20manager/Locations/work/Send%20invites%20for%20christmas%20par.html"
+                            target="detail">Send invites for christmas party</a>
+                          </li>
                         </ul>
                       </li>
                       <li>Implementation
@@ -477,12 +477,12 @@
                           </li>
                           <li>shopping
                             <ul>
-                              <li><a href="root/Trilium%20Demo/Scripting%20examples/Task%20manager/Locations/mall/Buy%20some%20book%20for%20Bob.html"
-                                target="detail">Buy some book for Bob</a>
-                              </li>
                               <li><a href="root/Trilium%20Demo/Scripting%20examples/Task%20manager/Locations/tesco/Buy%20milk.html"
                                 target="detail">Buy milk</a>
                               </li>
+                              <li><a href="root/Trilium%20Demo/Scripting%20examples/Task%20manager/Locations/mall/Buy%20some%20book%20for%20Bob.html"
+                                target="detail">Buy some book for Bob</a>
+                              </li>
                             </ul>
                           </li>
                           <li>groceries
diff --git a/apps/edit-docs/demo/root/Trilium Demo/Inbox/The Last Question.html b/apps/edit-docs/demo/root/Trilium Demo/Inbox/The Last Question.html
index e0d736c1b..3cb00a8e4 100644
--- a/apps/edit-docs/demo/root/Trilium Demo/Inbox/The Last Question.html	
+++ b/apps/edit-docs/demo/root/Trilium Demo/Inbox/The Last Question.html	
@@ -22,6 +22,7 @@
           <p>This page demonstrates two things:</p>
           <ul>
             <li>possibility to <a href="#root/_hidden/_help/_help_KSZ04uQ2D1St/_help_iPIMuisry3hd/_help_nBAXQFj20hS1">include one note into another</a>
+
             </li>
             <li>PDF preview - you can read PDFs directly in Trilium!</li>
           </ul>
diff --git a/apps/server/src/assets/db/demo.zip b/apps/server/src/assets/db/demo.zip
index 26876b69d..671d2a6df 100644
Binary files a/apps/server/src/assets/db/demo.zip and b/apps/server/src/assets/db/demo.zip differ