Improve anchor highlighting