Fix feed, fix highlight