Bugfix map -> each. JSON performance improvement!?