Bugfix; special characters get url-encoded in et.js but weren't getting decoded on the server
Removing module-level circular dependency
dropped spurious semi-colon and add toJSON