Watched indicator issue

There’s something wrong with watched indicator for a long time now, Other videos that i marked watched or done watching eventually became unwatched and have a few seconds/minutes left after checking it again. It’s not good for series because the selection resumes at the videos which I already watched instead of continuing the latest episode to watch. Is there a future fix for this?