REFACTOR: Continued topic-list tweaks (PR #14977)

This commit adds needed changes to the bookmarked topic lists.

GitHub