data-js bug fix. Also fix showhide.js bug