Developer-207 For Fix Issues related to Js