Add "Available to Watch" Filter to Watchlist

It would nice while filtering by Service, I had an option for only the services I have selected, and / or any service PLEX can search. I also agree with the Watch Now option. Unless I’m wrong, my understanding of the Discover and Watchlist would be to 1st discover things I’m interested in, either from my selected services, and / or any service if I so choose…2nd, then add items I like to my watchlist. The Watchlist could then be used to review items that are currently available to watch now, what’s coming up, and what service they are located on…local, shared, and streaming service, preferably the services I’ve selected, and any / or if I so choose. Integrating the watchlist with the Guide would be great for seeing when something from my watchlist is available. Also…leave shows in the Watchlist after watching them. I use the watch list instead of the spreadsheet I’ve been maintaining for years.