Filter movies on watch list and calendar to streaming

I would love a way to filter (or postpone in some way) movies from appearing in my watch list and calendar until they release on streaming. Often times I don’t plan to see a movie until it’s available to stream, so I have to wait months with it in my “ready to watch” list even though it’s not available to me yet.

I’d also love to be able to choose between digital release (paid) vs streaming via a subscription. Or maybe even streaming on services I have.