Custom Data Listing fix in case if source data has vanished