Remove client-side JavaScript
Merge two mixins to make them easier to edit
Fix an issue with calling highlightQuery() with an empty query