Fixed highlight layer overlap issues.