Dcat parser fixes