Added more debug to debug
Fixed EAVL-9 dropping into the same target
Validation page update for EAVL-5