                         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 (merge-activity previous-entries [] :asc)
-                        next-activity (merge-activity next-entries [] :desc)]
+                        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)

            [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 -----


;; TODO This activity stuff, `activity-sort`, `merge-activity` and `assemble-activity` is overly complicated
;; because it used to merge entries and stories. It no longer does so can be simplified. This also may entail some
;; changes to `entry/list-entries-by-org`

(defn- assemble-activity
  "Assemble the requested activity (params) for the provided org."
