adding WatchCount and fix GetItem after notification