improved tag support for incremental update