Fix a bug where highlights are not cleared