Fix broken js
Merge branch 'master' into feature/internalnote