Fixed issue with legacy and non-legacy datasources
Added debug on cdf on getHeaders to be used by cde