From 55d9a335a627f131b714df57d2fcd7018a1c6252 Mon Sep 17 00:00:00 2001
From: Joscha Rohmann <joscha-rohmann@online.de>
Date: Sat, 14 Nov 2015 22:29:59 +0100
Subject: [PATCH] Fixed missing condition and .rawValue from a previous change
 on serverside template query.

---
 src/node/overrides.js | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/node/overrides.js b/src/node/overrides.js
index e7fe520..5b7bd41 100644
--- a/src/node/overrides.js
+++ b/src/node/overrides.js
@@ -113,11 +113,14 @@ define([
   };
 
   blocks.queries.template.preprocess = function (domQuery, html, value) {
-    if (VirtualElement.Is(html)) {
-      html = html.html();
-    } else if (blocks.isObject(html)) {
-      html =  GLOBAL[html.rawValue] && GLOBAL[html.rawValue].html();
+    if (blocks.isObject(html)) {
+      if (VirtualElement.Is(html.rawValue)) {
+        html = html.rawValue.html();
+      } else {
+        html =  GLOBAL[html.rawValue] && GLOBAL[html.rawValue].html();
+      }
     }
+
     if (blocks.isObject(value) && value.parameterName) {
       value = value.rawValue;
     }