Bug fix, extend jsonload

jsonload changes are required by tests