diff --git a/js/lib/ext.core.TemplateHandler.js b/js/lib/ext.core.TemplateHandler.js
index <HASH>..<HASH> 100644
--- a/js/lib/ext.core.TemplateHandler.js
+++ b/js/lib/ext.core.TemplateHandler.js
@@ -198,7 +198,9 @@ TemplateHandler.prototype._expandTemplate = function ( state, frame, cb, attribs
 							attribTokens = Util.flattenAndAppendToks(attribTokens, null, kv.k);
 						}
 						if (kv.v) {
-							attribTokens = Util.flattenAndAppendToks(attribTokens, "=", kv.v);
+							attribTokens = Util.flattenAndAppendToks(attribTokens,
+								kv.k ? "=" : '',
+								kv.v);
 						}
 						attribTokens.push('|');
 					} );
Fix re-joining of key/value pairs for invalid templates

The equal sign was inserted even for empty keys. One more parser test green.

Change-Id: I7f<I>a7c<I>bbffe<I>fbbcf<I>e<I>bd<I>f<I>d8