unused field removed and tagging logic changed