tweak watchitem API and entry data