Use regexs instead of exploding in more places.
Merge pull request #177 from jordandukart/7.x-UC-22

Use regexs instead of exploding in more places.