make json connector fully independent - no switches
make json connector fully independent - no switches
minor json connector refactoring