fix alert list and watches