       (log this "Preparing boolean search for " (pr-str q))
       (doto (SolrQuery. q)
         (.setQueryType "standard")
-        (apply-sort-options this)))))
+        (apply-sort-options this)
+        (apply-highlight-options)))))
 
 (defmethod get-solr-query :citation [this type]
   (let [params (get-query-params this)]

(defn apply-sort-options [solr-query this]
  (.setSortField solr-query (get-sort-field this) SolrQuery$ORDER/desc))

(defmulti get-solr-query (fn [this type] type))

(defmethod get-solr-query :simple [this type]

     :total_hits (.getNumFound docs)
     :start_hit (if (zero? (.getNumFound docs)) 0 (inc (.getStart docs)))
     :end_hit (+ (.getStart docs) (count docs))
     :hits (map (partial prepare-hit (.getHighlighting solr-response))
                docs)}))

(defn html-exception-layout [data]
  (let [root-cause (loop [e (:exception data)]
