EVERREST-55: improve json processing