                                                                   [:spacer 0]
                                                                   (into [:paragraph {:indent 0} ] (for [e $endorsements]
                                                                                                     [:paragraph
-                                                                                                     (or (:issuer_name e) "-") "\n"
+                                                                                                     (:issuer_name e) "\n"
                                                                                                      [:anchor {:target (:issuer_url e) :style{:family :times-roman :color [66 100 162]}} (or (:issuer_url e) "-")] "\n"
-                                                                                                     [:chunk (date-from-unix-time (long (* 1000 (:issued_on e))))] "\n"
-                                                                                                     (when-not (blank? (:content e))
-                                                                                                       (markdown->clj-pdf {:wrap {:global-wrapper :paragraph}} (:content e)))]))])
+                                                                                                     [:chunk (if (number? (:issued_on e)) (date-from-unix-time (long (* 1000 (:issued_on e)))) (:issued_on e))] "\n"
+                                                                                                     (process-markdown "Endorsements" (:content e))]))])
 
                                                                [:line {:dotted true}]
                                                                [:spacer 0]
                                                                [:heading.heading-name (t :badge/IssuerInfo ul)]
                                                                [:spacer 0]
-                                                               (when-not (blank? (:issuer_description %))
-                                                                 [:paragraph.generic
-                                                                  [:chunk.chunk (str (t :badge/IssuerDescription ul)": ")] (or (:issuer_description %) "-")])
+                                                               [:paragraph.generic
+                                                                [:chunk.chunk (str (t :badge/IssuerDescription ul)": ")] (:issuer_description %) ]
                                                                [:spacer 1]
                                                                [:paragraph.generic
                                                                 [:chunk.chunk (str (t :badge/IssuerWebsite ul)": ")]
-                                                                [:anchor {:target (:issuer_content_url %) :style{:family :times-roman :color [66 100 162]}} (or (:issuer_content_url %) "-")]]
-                                                               (when-not (blank? (:issuer_contact %))
-                                                                 [:paragraph.generic
-                                                                  [:chunk.chunk (str (t :badge/IssuerContact ul)": ")] (:issuer_contact %)])
-                                                               (when-not (blank? (:creator_description %))
+                                                                [:anchor {:target (:issuer_content_url %) :style{:family :times-roman :color [66 100 162]}}  (:issuer_content_url %)]]
+                                                               [:paragraph.generic
+                                                                [:chunk.chunk (str (t :badge/IssuerContact ul)": ")] (:issuer_contact %)]
+                                                               (when-not (= "-" (:creator_description %))
                                                                  [:paragraph.generic
                                                                   [:chunk.chunk (str (t :badge/CreatorDescription ul)": ")] (:creator_description %)])
-                                                               (when-not (blank? (:creator_url %))
+                                                               (when-not (= "-" (:creator_url %))
                                                                  [:paragraph.generic
                                                                   [:chunk.chunk (str (t :badge/CreatorWebsite ul)": ")] [:anchor {:target (:creator_url %) :style{:family :times-roman :color [66 100 162]}} (:creator_url %)] "\n"])
-                                                               (when-not (blank? (:creator_contact %))
+                                                               (when-not (= "-" (:creator_email %))
                                                                  [:paragraph.generic
-                                                                  [:chunk.chunk (str (t :badge/CreatorContact ul)": ")] (:creator_contact %)])
-                                                               (let [issuer-endorsement (select-issuer-endorsements {:id (:issuer_content_id %)} (u/get-db ctx))]
+                                                                  [:chunk.chunk (str (t :badge/CreatorContact ul)": ")] (:creator_email %)])
+                                                               (let [issuer-endorsement (replace-nils (select-issuer-endorsements {:id (:issuer_content_id %)} (u/get-db ctx)))]
                                                                  (when-not (empty? issuer-endorsement)
                                                                    [:paragraph.generic
                                                                     [:spacer]

                                                                    (into [:paragraph {:indent 0} ]
                                                                          (for [e issuer-endorsement]
                                                                            [:paragraph {:indent 0}
                                                                             (or (:issuer_name e) "-") "\n"
                                                                             [:anchor {:target (:issuer_url e) :style{:family :times-roman :color [66 100 162]}} (or (:issuer_url e) "-")] "\n"
                                                                             [:chunk.link (date-from-unix-time (long (* 1000 (:issued_on e))))] "\n"
                                                                             (when-not (blank? (:content e))
                                                                               (markdown->clj-pdf {:wrap {:global-wrapper :paragraph}} (:content e)))]))]))

                                                               [:pdf-table {:align :right :width-percent 100 :cell-border false}
                                                                nil
                                                                [[:pdf-cell [:paragraph {:align :right} [:chunk [:image  {:width 85 :height 85 :base64 true} $qr_code]]"\n"
                                                                             [:phrase [:chunk.link {:style :italic} (str site-url "/badge/info/" $id)]]]]
                                                                 ]]

                                                               [:pagebreak]])

                               content (if (= lang "all") (map template $content) (map template (filter #(= (:default_language_code %) (:language_code %)) $content)))]

                           (reduce into [[:chapter ]] content)))]
    (fn [output-stream]
      (pdf/pdf (into [pdf-settings] (badge-template badges)) output-stream)))
  )

  (let [data-dir (get-in ctx [:config :core :data-dir])
        site-url (get-in ctx [:config :core :site-url])
        badges (pdf-generator-helper ctx user-id input)
        user-data (ud/user-information ctx user-id)
        ul (if (blank? (:language user-data)) "en" (:language user-data))
        font-path  (first (mapcat #(get-in ctx [:config % :font] []) (get-plugins ctx)))
        font  {:ttf-name (str site-url font-path)}
        stylesheet {:heading-name {:color [127 113 121]
