Tweaked multi-comment hr handling