added explicit requirement for top/higgs matching to fat jet and fat jet to groomed jet