     (catch Object _
       {:status "error" :message _})))
 
-(defn badge-settings
+#_(defn badge-settings
   "Get badge settings"
   [ctx user-badge-id user-id]
   (if (badge-owner? ctx user-badge-id user-id)
     (let [badge (update (select-badge-settings {:id user-badge-id} (into {:result-set-fn first} (u/get-db ctx))) :criteria_content u/md->html)
           tags (select-taglist {:user_badge_ids [user-badge-id]} (u/get-db ctx))]
       (assoc-badge-tags badge tags))))
+
+(defn badge-settings "Get badge settings" [ctx user-badge-id user-id]
+  (if (badge-owner? ctx user-badge-id user-id)
+    (let [badge (update (select-badge-settings {:id user-badge-id} (into {:result-set-fn first} (u/get-db ctx))) :criteria_content u/md->html)
+          tags (select-taglist {:user_badge_ids [user-badge-id]} (u/get-db ctx))
+          evidences (badge-evidences ctx user-badge-id)]
+      (-> (assoc-badge-tags badge tags)
+          (assoc :evidences evidences)
+          )
+      )
+    )
+  )
 
 (defn send-badge-info-to-obf [ctx user-badge-id user-id]
   (let [obf-url (get-in ctx [:config :core :obf :url])

            [clojure.tools.logging :as log]
            [clojure.java.jdbc :as jdbc]
            [clojure.set :refer [rename-keys]]
            [clojure.string :refer [blank? split upper-case lower-case capitalize includes?]]
            [slingshot.slingshot :refer :all]
            [clojure.data.json :as json]
            [salava.core.time :refer [unix-time date-from-unix-time]]

                 :revoked (check-badge-revoked ctx badge-id (:revoked badge) (:assertion_url badge) (:last_checked badge))
                 :assertion (parse-assertion-json (:assertion_json badge))

                 :qr_code (u/str->qr-base64 (badge-url ctx badge-id))
              ;;
                 :evidences evidences
      )))


(defn get-endorsements [ctx badge-id]
