                           (r/get-all [(r/get-field row :uuid)] {:index :resource-uuid})
                           (r/pluck relation-fields)
                           (r/coerce-to :array))
-           :debug {:unread-with-cap unread-with-cap?
-                   :unread-thread unread-thread?}})))
+           ;; FIXME: debug
+           ; :debug {:unread-with-cap unread-with-cap?
+           ;         :unread-thread unread-thread?}
+          })))
        ;; Filter by user-visibility
        (r/filter query (r/fn [row]
         (r/and (r/gt (r/get-field row [:comments-count]) 0)
                ;; Filter out threads that have comments only from the current user
-               ;; ***** Commented out since we want every entry no matter who commented *****
-               ;; ***** Uncomment this to show only entries with comments from others   *****
                ; (-> (r/get-field row [:reply-authors])
                ;  (r/filter user-id)
                ;  (r/is-empty)

                         (r/add sort-value-base unread-cap-ms)
                         ;; The timestamp in seconds
                         sort-value-base)
           ;; ***** Commented out since we want every entry no matter who commented *****
           ;; ***** Uncomment this to show only entries with comments from others   *****
           ; :reply-authors (-> interactions-base
           ;                 (r/coerce-to :array)
           ;                 (r/map (r/fn [inter] (r/get-field inter [:author :user-id])))

                     (r/and (= direction :after)
                            (r/le start (r/get-field row :sort-value))))
               ;; Filter on the user's visibility map:
               (r/or ;; has :follow true
                     (-> row
                      (r/get-field [:user-visibility (keyword user-id) :follow])
                      (r/default false))
                     ;; has :unfollow false (key actually exists)
                     (-> row
                      (r/get-field [:user-visibility (keyword user-id) :unfollow])
                      (r/default true)
                      (r/not))))))
       ;; Sort
       (if-not count
        (r/order-by query (order-fn :sort-value))
