Update rules by taking out ?
Revert "Update rules by taking out ?"

This reverts commit 9a1e5fe0e24fd71ce884f88f03ad036a6664878b.
Take out 'r' in the regex rules, and modify the rules so some will have (.*?) and other (.*)