Some bug fixes on highlights