diff --git a/public/src/templates.js b/public/src/templates.js
index de538645e8..27a1a4af1d 100644
--- a/public/src/templates.js
+++ b/public/src/templates.js
@@ -113,8 +113,8 @@ var templates = {};
 
 			for (var d in data) {
 				if (data.hasOwnProperty(d)) {
-					if (data[d] instanceof String || data[d] === null) {
-						continue;
+					if (data[d] === null) {
+						template = replace(namespace + d, '', template);
 					} else if (data[d].constructor == Array) {
 						namespace += d;
 						
@@ -127,9 +127,9 @@ var templates = {};
 						do {
 							result += parse(data[d][i], namespace + '.', block);
 						} while (i++ < numblocks);
-						
+
+						namespace = namespace.replace(d, '');
 						template = setBlock(regex, result, template);
-						
 					} else if (data[d] instanceof Object) {
 						namespace += d + '.';
 						
@@ -142,7 +142,7 @@ var templates = {};
 					} else {								
 						template = replace(namespace + d, data[d], template);
 					}
-				}					
+				}
 			}
 
 			if (namespace) {
diff --git a/src/templates.js b/src/templates.js
index b9b97571c9..30a14df328 100644
--- a/src/templates.js
+++ b/src/templates.js
@@ -17,6 +17,7 @@ var fs = require('fs');
 						};
 					}
 
+					template.prototype.file = file;
 					template.prototype.parse = parse;
 					template.prototype.html = String(html);
 					
@@ -65,6 +66,7 @@ var fs = require('fs');
 		var template = this.html, regex, block;
 
 		return (function parse(data, namespace, template) {
+			console.log(this.file + ' is being called on server side. Templates will be deprecated soon');
 			if (Object.keys(data).length == 0) {
 				regex = makeRegex('[^]*');
 				template = template.replace(regex, '');