Refactor highlights subfeeds