Issue #2391933 follow-up: Some js fixes