get rid of the rest of those stupid JS
Merge branch 'placeholder-search' into merge-branch