added gen filter to select hadronic and leptinic Z/W decays