Fixup script to support more JSON
Fixed message js files