diff --git a/src/clj/auto_ap/graphql.clj b/src/clj/auto_ap/graphql.clj
index dc7d53ba..b72c0bd2 100644
--- a/src/clj/auto_ap/graphql.clj
+++ b/src/clj/auto_ap/graphql.clj
@@ -835,35 +835,32 @@
   ([id q v]
    (statsd/increment "query.graphql.count" {:tags #{(str "query:" (query-name q))}})
    (statsd/time! [(str "query.graphql.time" ) {:tags #{(str "query:" (query-name q))}}]
-                 (mu/with-context {:query q :user id}
-                   (mu/trace 
-                    ::user-query
-                    []
-                    (lc/with-context {:query q}
-                      (log/info "executing query name" (query-name q))
-                      (try 
-                        (let [[result time] (time-it (simplify (execute schema q v {:id id})))]
-                          (info-event "Query completed"
-                                      {:time   (:time time)
-                                       :errors (seq (:errors result))})
-                          (when (seq (:errors result))
-                            (throw (ex-info "GraphQL error" {:result result})))
-                          result)
+                 (mu/with-context {:query-string q :user id}
+                   (lc/with-context {:query q}
+                     (log/info "executing query name" (query-name q))
+                     (try 
+                       (let [[result time] (time-it (simplify (execute schema q v {:id id})))]
+                         (info-event "Query completed"
+                                     {:time   (:time time)
+                                      :errors (seq (:errors result))})
+                         (when (seq (:errors result))
+                           (throw (ex-info "GraphQL error" {:result result})))
+                         result)
 
-                        (catch Exception e
-                          (if-let [v (or (:validation-error (ex-data e))
-                                         (:validation-error (ex-data (.getCause e))))]
-                            
-                            (do 
-                              (alog/warn ::query-validation
+                       (catch Exception e
+                         (if-let [v (or (:validation-error (ex-data e))
+                                        (:validation-error (ex-data (.getCause e))))]
+                           
+                           (do 
+                             (alog/warn ::query-validation
+                                        :exception e)
+                             (warn-event "validation error" {:validation-error v
+                                                             :data             (ex-data e)})
+                             (throw e)
+                             #_{:errors [{:message v}]})
+                           (do 
+                             (error-event "query error" {:error e})
+                             (alog/error ::query-error
                                          :exception e)
-                              (warn-event "validation error" {:validation-error v
-                                                              :data             (ex-data e)})
-                              (throw e)
-                              #_{:errors [{:message v}]})
-                            (do 
-                              (error-event "query error" {:error e})
-                              (alog/error ::query-error
-                                          :exception e)
 
-                              (throw e)))))))))))
+                             (throw e))))))))))
diff --git a/src/clj/auto_ap/graphql/utils.clj b/src/clj/auto_ap/graphql/utils.clj
index d7eb1316..8482bff5 100644
--- a/src/clj/auto_ap/graphql/utils.clj
+++ b/src/clj/auto_ap/graphql/utils.clj
@@ -147,7 +147,8 @@
   (fn trace [a b c]
     (mu/with-context {:query key
                       :mutation (boolean (= "mutation"
-                                            (namespace key)))}
+                                            (namespace key)))
+                      :user (:id a)}
       (mu/trace (keyword "graphql" (name key))
         []
         (f a b c)))))