Refactor highlights subfeeds

Different way of building highlights sub feed to hopefully make it quicker and cleaner to build new subfeeds.