fixed tags issue