Add back related topics

/cc @matthew-andrews