(@option_group_id_adOpt, '{ts escape="sql"}Street Address{/ts}' , 1, 'street_address', NULL, 0, NULL, 1, NULL, 0, 0, 1, NULL, NULL, NULL),
(@option_group_id_adOpt, '{ts escape="sql"}Supplemental Address 1{/ts}' , 2, 'supplemental_address_1', NULL, 0, NULL, 2, NULL, 0, 0, 1, NULL, NULL, NULL),
(@option_group_id_adOpt, '{ts escape="sql"}Supplemental Address 2{/ts}' , 3, 'supplemental_address_2', NULL, 0, NULL, 3, NULL, 0, 0, 1, NULL, NULL, NULL),
- (@option_group_id_adOpt, '{ts escape="sql"}City{/ts}' , 4, 'city' , NULL, 0, NULL, 4, NULL, 0, 0, 1, NULL, NULL, NULL),
- (@option_group_id_adOpt, '{ts escape="sql"}Postal Code{/ts}' , 5, 'postal_code' , NULL, 0, NULL, 5, NULL, 0, 0, 1, NULL, NULL, NULL),
- (@option_group_id_adOpt, '{ts escape="sql"}Postal Code Suffix{/ts}', 6, 'postal_code_suffix', NULL, 0, NULL, 6, NULL, 0, 0, 1, NULL, NULL, NULL),
- (@option_group_id_adOpt, '{ts escape="sql"}County{/ts}' , 7, 'county' , NULL, 0, NULL, 7, NULL, 0, 0, 1, NULL, NULL, NULL),
- (@option_group_id_adOpt, '{ts escape="sql"}State/Province{/ts}' , 8, 'state_province', NULL, 0, NULL, 8, NULL, 0, 0, 1, NULL, NULL, NULL),
- (@option_group_id_adOpt, '{ts escape="sql"}Country{/ts}' , 9, 'country' , NULL, 0, NULL, 9, NULL, 0, 0, 1, NULL, NULL, NULL),
- (@option_group_id_adOpt, '{ts escape="sql"}Latitude{/ts}' , 10, 'geo_code_1' , NULL, 0, NULL, 10, NULL, 0, 0, 1, NULL, NULL, NULL),
- (@option_group_id_adOpt, '{ts escape="sql"}Longitude{/ts}' , 11, 'geo_code_2', NULL, 0, NULL, 11, NULL, 0, 0, 1, NULL, NULL, NULL),
- (@option_group_id_adOpt, '{ts escape="sql"}Address Name{/ts}' , 12, 'address_name', NULL, 0, NULL, 12, NULL, 0, 0, 1, NULL, NULL, NULL),
- (@option_group_id_adOpt, '{ts escape="sql"}Street Address Parsing{/ts}', 13, 'street_address_parsing', NULL, 0, NULL, 13, NULL, 0, 0, 1, NULL, NULL, NULL),
+ (@option_group_id_adOpt, '{ts escape="sql"}Supplemental Address 3{/ts}' , 4, 'supplemental_address_3', NULL, 0, NULL, 4, NULL, 0, 0, 1, NULL, NULL, NULL),
+ (@option_group_id_adOpt, '{ts escape="sql"}City{/ts}' , 5, 'city' , NULL, 0, NULL, 5, NULL, 0, 0, 1, NULL, NULL, NULL),
+ (@option_group_id_adOpt, '{ts escape="sql"}Postal Code{/ts}' , 6, 'postal_code' , NULL, 0, NULL, 6, NULL, 0, 0, 1, NULL, NULL, NULL),
+ (@option_group_id_adOpt, '{ts escape="sql"}Postal Code Suffix{/ts}', 7, 'postal_code_suffix', NULL, 0, NULL, 7, NULL, 0, 0, 1, NULL, NULL, NULL),
+ (@option_group_id_adOpt, '{ts escape="sql"}County{/ts}' , 8, 'county' , NULL, 0, NULL, 8, NULL, 0, 0, 1, NULL, NULL, NULL),
+ (@option_group_id_adOpt, '{ts escape="sql"}State/Province{/ts}' , 9, 'state_province', NULL, 0, NULL, 9, NULL, 0, 0, 1, NULL, NULL, NULL),
+ (@option_group_id_adOpt, '{ts escape="sql"}Country{/ts}' , 10, 'country' , NULL, 0, NULL, 10, NULL, 0, 0, 1, NULL, NULL, NULL),
+ (@option_group_id_adOpt, '{ts escape="sql"}Latitude{/ts}' , 11, 'geo_code_1' , NULL, 0, NULL, 11, NULL, 0, 0, 1, NULL, NULL, NULL),
+ (@option_group_id_adOpt, '{ts escape="sql"}Longitude{/ts}' , 12, 'geo_code_2', NULL, 0, NULL, 12, NULL, 0, 0, 1, NULL, NULL, NULL),
+ (@option_group_id_adOpt, '{ts escape="sql"}Address Name{/ts}' , 13, 'address_name', NULL, 0, NULL, 13, NULL, 0, 0, 1, NULL, NULL, NULL),
+ (@option_group_id_adOpt, '{ts escape="sql"}Street Address Parsing{/ts}', 14, 'street_address_parsing', NULL, 0, NULL, 14, NULL, 0, 0, 1, NULL, NULL, NULL),
(@option_group_id_gType, '{ts escape="sql"}Access Control{/ts}', 1, 'Access Control', NULL, 0, NULL, 1, NULL, 0, 1, 1, NULL, NULL, NULL),
(@option_group_id_gType, '{ts escape="sql"}Mailing List{/ts}', 2, 'Mailing List', NULL, 0, NULL, 2, NULL, 0, 1, 1, NULL, NULL, NULL),
(@bounceTypeID, 'sender was rejected'),
(@bounceTypeID, 'spam(check| reduction software| filters?)'),
(@bounceTypeID, 'blocked by a user configured filter'),
- (@bounceTypeID, '(detected|rejected) as spam'),
+ (@bounceTypeID, '(detected|rejected) (as|due to) spam'),
(@bounceTypeID, 'X-HmXmrOriginalRecipient'),
(@bounceTypeID, 'Client host .[^ ]*. blocked'),
(@bounceTypeID, 'automatic(ally-generated)? messages are not accepted'),