adding more support for tags