small fixes for next tag set