[Front-end] Bug fix to watching