Changes made to js to resolve Boohma:140 issue