Change file scanning to search for more targeted regexes, and consolidate XML text when searching for terms.