[pti] cleanup, make tag handling default