fixed data comparison bug in watch tool and others