add tagging support to demo