Improve menu highlight validation.