Sublinks and show-comments refactored