fixing tags issue