more fixes of Route Discovery evaluation