fixed match highlighting and arrow