fix backend json encode
Merge branch 'frontend' into development