modify selection order and add non-semilep ttbar