Merge branch 'hotfix/js-broken'
Including quotes in calls.
Merge branch 'hotfix/thumbs_broken' into develop