Monitoring: fix JS-code issues
Monitoring: cosmetics