 
 (defn- pre-expand [qp]
   (fn [query]
-    (qp (resolve/resolve (expand/expand query)))))
+    (if (structured-query? query)
+      (qp (resolve/resolve (expand/expand query)))
+      (qp query))))
 
 
 (defn- post-add-row-count-and-status

      (reset! called? true)
      (qp query))))

(defn- process-structured [{:keys [driver], :as query}]
  (let [driver-process-query      (:process-query driver)
        driver-wrap-process-query (or (:process-query-in-context driver)
                                      (fn [qp] qp))]

          annotate/post-annotate
          pre-log-query
          wrap-guard-multiple-calls
          driver-process-query) (assoc query
                                       :driver driver))))
