Fix javascript error
[sprint 48 resolved issues SAT-979, SAT-983, SAT-980, SAT-981]