EU roaming in Switzerland

Hello, so last week I was on a plan which gives me flat rates for internet 1 GB in Germany and EU zone 1 and 2.

I was happy with it because zone 2 includes Switzerland and I travel there a lot for work.

Every time I enter Switzerland, I get the sms (attached) which says it costs me nothing to use internet or phone calls in Switzerland, and because I get it almost weekly, I ignore it.

So I extended my contract for two more years and I believe I have chosen the same options like my last contract, but this time when I travelled, I got another sms which says it is now costing me and unfortunately I though it was an error because I know it does not cost me according to what I am used to for 2 years. Then two days later another sms saying im charged 60 EUR and now it will stop the data roaming to prevent further charges.

My question is, when I extended the contract, did O2 change the list of EU free roaming countries and did not alert me that my extended contract will not include Switzerland ? 

 My second question, if the answer was yes, can I please get the same contract I had for the last 2 years and was very satisfying to me ? Removing features from a renewed contract does not motivate me to renew, I would have simply cancelled and looked for a different contract.

My third question, is there any chance O2 would keep a customer happy by removing those extra 60 euros which obviously happened due to the fact that I am used to not being charged for that. It is unbelievable that I get to pay 60 euros for 2 days without realizing that I am being charged.

thank you very much