fix for 'mapToSource' issue and 'no data received yet' issue