                   
                   (= order :asc)
                   (let [previous-entries (entry-res/list-entries-by-org conn (:uuid org) order start direction allowed-boards {:must-see must-see})
-                        previous-activity (merge-activity previous-entries [] :asc)]
+                        previous-activity (sort/sort-activity previous-entries :asc config/default-activity-limit)]
                     {:direction :previous
                      :previous-count (count previous-activity)
                      :activity (reverse previous-activity)})
 
                   :else
                   (let [next-entries (entry-res/list-entries-by-org conn (:uuid org) order start direction allowed-boards {:must-see must-see})
-                        next-activity (merge-activity next-entries [] :desc)]
+                        next-activity (sort/sort-activity next-entries :desc config/default-activity-limit)]
                     {:direction :next
                      :next-count (count next-activity)
                      :activity next-activity}))]

            [oc.storage.representations.activity :as activity-rep]
            [oc.storage.resources.org :as org-res]
            [oc.storage.resources.board :as board-res]
            [oc.storage.resources.entry :as entry-res]))

;; ----- Utility functions -----


                        around-start (f/unparse db-common/timestamp-format around-stamp)
                        previous-entries (entry-res/list-entries-by-org conn (:uuid org) :asc around-start :after allowed-boards {:must-see must-see})
                        next-entries (entry-res/list-entries-by-org conn (:uuid org) :desc start :before allowed-boards {:must-see must-see})
                        previous-activity (sort/sort-activity previous-entries :asc config/default-activity-limit)
                        next-activity (sort/sort-activity next-entries :desc config/default-activity-limit)]
                    {:direction :around
                     :previous-count (count previous-activity)
                     :next-count (count next-activity)
