fixing data source param passing