Updated lepton selector by removing analysis dependence