fixed parsing issues conversion into hash