Fixed some edge cases in eval landmarking
This reverts commit dcbf7645b6b4d5e86c6a2d0f4e681797f6ab85af.