Improved tag + buffer handling