Hopefully fixes #109 highlighting/searching bug