Fix tag matching following spec
3 files changed