Fix watch feature after refactoring to controller pattern.