Add 'tag -f' support