Make sure contexts are returned in JSON views
Note the schema changes of late