moved highlight to a Source model method
better caching