Added checking and tapping for Source items

More work on Downloader/Subscribe