bugfix + preserving original json structure