ADEN-1545 Improve Evolve targeting