small updates to data sources logic
fix for date mapper in MLEntityMapper