Fix to match

1. Will not account for escaped and unescaped quotes
2. Will now match only at the beginning and end of the substring