add tags suport, end is near