Bear in mind that item-specific variables such as [%os2%] will not work in a Common Thank-you Email nor Common Thank-you Page HTML; they only work in a product-based thank-you email template or a specific product's Message (HTML) field. If this does not resolve your concern, does the option 2 value show up in your E-junkie Transaction Log for affected sales? If not, there may be a problem with the button code in your Web page; we could have a look at that if you provide your page URL.
If the [%custom%] variable was being used in a product-based thank-you email, did you remember to Enable Templated Email for that product?