fix(highlight): better range and fix if no messages