some fixes, externate datasources parameters