VID-1824 Fixed use of eval and other jshint errors