fix highlight model; add to issue preview