Added js validation to prevent unwanted mass updates
Merged