fix to data source, username shopping, password shopping