Fix js load ordering 798

Also fix double panel in search.js