Bugfix/json strings not escaped