js issues fix