More JSON-LD improvements