Fixed bad offset bug in highlighter
Add alternative listener for dictionary