added within-dataset only option, fixes for when smoking-gun doppels are found.