fixed highlight problems