Rebuild issue hierarchy loading to work better