Fixed some bugs relates to JS and JS ViewModels