diff --git a/apps/collections.json b/apps/collections.json
index 0a351a6b..abea7888 100644
--- a/apps/collections.json
+++ b/apps/collections.json
@@ -1,5 +1,5 @@
 {
   "type": "tildefriends-app",
-  "emoji": "📦",
-  "previous": "&1C4JMrg9rjeS6OxHYblN7v1vNAEfDXkyRPDmnHhzPQo=.sha256"
+  "emoji": "📝",
+  "previous": "&CsLn1jrN7+Zztpnb3Br1yMwvmef9yQ6c090M+eT8d80=.sha256"
 }
\ No newline at end of file
diff --git a/apps/collections/tf-collection.js b/apps/collections/tf-collection.js
index 4217664b..ba73ed7e 100644
--- a/apps/collections/tf-collection.js
+++ b/apps/collections/tf-collection.js
@@ -35,6 +35,12 @@ class TfCollectionElement extends LitElement {
 			} else {
 				return;
 			}
+			if (content.type !== this.type ||
+				(this.parent && content.parent !== this.parent)) {
+				return;
+			}
+		} else {
+			content.draft = false;
 		}
 		if (content?.key) {
 			if (content?.tombstone) {
@@ -93,8 +99,9 @@ class TfCollectionElement extends LitElement {
 		if (this.visible &&
 			this.visible.indexOf(message.author) != -1 &&
 			JSON.parse(message.content).type == this.type) {
+			let self = this;
 			this.process_message(message).then(function() {
-				this.collections = [...Object.values(this.by_id)];
+				self.collections = [...Object.values(self.by_id)];
 			});
 		}
 	}
diff --git a/apps/collections/tf-wiki-doc.js b/apps/collections/tf-wiki-doc.js
index 63da6070..7d30a195 100644
--- a/apps/collections/tf-wiki-doc.js
+++ b/apps/collections/tf-wiki-doc.js
@@ -74,7 +74,7 @@ class TfWikiDocElement extends LitElement {
 			<div style="display: inline-flex; flex-direction: row">
 				<button ?disabled=${!this.whoami || this.is_editing} @click=${() => self.is_editing = true}>Edit</button>
 				<button ?disabled=${this.blob == this.blob_original} @click=${this.on_save_draft}>Save Draft</button>
-				<button ?disabled=${this.blob == this.blob_original} @click=${this.on_publish}>Publish</button>
+				<button ?disabled=${this.blob == this.blob_original && !this.value?.draft} @click=${this.on_publish}>Publish</button>
 				<button ?disabled=${!this.is_editing} @click=${this.on_discard}>Discard</button>
 			</div>
 			<div style="display: flex; flex-direction: row">