Improve 20-pma regex
Improve 40-bugzilla regex