Switch to regexps for has_substr
Update OASIS