WIP
Merge branch 'fixes'
Purge misused type=json