Add contnet-type for /data. Fix bug, return proper data
Include content-type
Enhanced omponent catalogue