added regex to improve matches

should work and fix false positives