Improve watch next/continue watching feature