diff --git a/botanjs/src/Astro/Blog/AstroEdit/SiteLibrary.js b/botanjs/src/Astro/Blog/AstroEdit/SiteLibrary.js
index 3478892..848c1f1 100644
--- a/botanjs/src/Astro/Blog/AstroEdit/SiteLibrary.js
+++ b/botanjs/src/Astro/Blog/AstroEdit/SiteLibrary.js
@@ -53,8 +53,8 @@
 			{
 				return [
 					new DataKey("id", data.id)
-					, new DataKey("title", data.name)
-					, new DataKey("author", data.author)
+					, new DataKey("title", decodeURI(data.name))
+					, new DataKey("author", decodeURI(data.author))
 					, new DataKey("hash", data.hash)
 				];
 			}
diff --git a/botanjs/src/Dandelion/IDOMElement.js b/botanjs/src/Dandelion/IDOMElement.js
index 136efb9..8e9345f 100644
--- a/botanjs/src/Dandelion/IDOMElement.js
+++ b/botanjs/src/Dandelion/IDOMElement.js
@@ -96,7 +96,7 @@
 	IDOMElement.prototype.getDAttribute = function(name)
 	{
 		var i = this.getAttribute("data-" + name);
-		return i;
+		return i && decodeURIComponent(i);
 	};
 
 	IDOMElement.prototype.foreach = function(type, callback)
diff --git a/botanjs/src/System/utils/DataKey.js b/botanjs/src/System/utils/DataKey.js
index 18ef075..065a414 100644
--- a/botanjs/src/System/utils/DataKey.js
+++ b/botanjs/src/System/utils/DataKey.js
@@ -7,7 +7,7 @@
 		IKey.call(
 			this
 			, "data-" + name
-			, value ? String( value ) : ""
+			, value ? encodeURIComponent( String( value ) ) : ""
 		);
 	};