Fix highlights to be properly removed