Fixed JSON issues with stormkeeper - STORM-76, STORM-81