VOLDEV-46: RelatedForumDiscussion performance fixes