added subjet type and multiple fatjet->subjet linking