Fix more id issues on highlighters