Jsonld fix

Merge but disabled for now.