vm tag support updates

Address code review comments as well as failing CI tests.