expanded tagging, new features