Add support for single tags