Junk string detection changes