Add highlights immediately too, not just on page load