On-Demand vs Streaming

I'm concerned about Xfinity directing me to streaming services instead of X1 On-Demand. I went to watch a HBO show via Xfinity On-Demand with my Xfinity X1 cable box (not the Xfinity On-Demand App). This does not count toward my monthly data as it is a TV service. However, it now directs me to HBO Max to watch a HBO on-demand show. This issue is HBO Max is a streaming service and counts toward my total monthly data. Is this a change to drive up my streaming data? I should be able to go in the Xfinity X1 service, --> On-Demand --> Network --> HBO and select an on-demand show, but it states I need to watch via HBO Max and gives me the notice this is a 3rd party app. Did Comcast/Xfinity elimiate HBO On-demand.? If that is my only option it is another reason to think about dumping Xfinity and just stream it via the HBO Max on AppleTV which has 4K video and better audio. If this is the case, they should make it clear it counts toward data.  If no other option, it's another reason to dump Xfinity- I hang on to be abe to use the Xfinity On-Demand function since it doesn't count against streaming.