changed 21 to look for both sw# and usearch patches