Added modify tag support, fixed tab indeces