Fixing search.
Allow highlighting
Tweaking js.