More improvements and fixes in Watchit Later