Refactor to correctly order branched issues