Refactor volume tag input

Fixes #2907