[Jaws_Plugin]: Fixed some issue related to new changes