Simplify filter parse regex
Simplify secondary filter regex
Merge pull request #417 from Shopify/simplify-regex

Simplify Variable Parsing Regexes