Current Tag: increase flexibility