Fix issue in plugin and entites js