Updated selection : isolation, charge check added