Highlighting
Clean up search builder
Merge branch 'master' into api