Update quantity regexes
Replace capture instead of using again regexp