Refactoring highlighting into search filtering concern. Disable (temporary)