CAL-197 fix js bugs after merge master to relooking