tags feature now included