Worked on fix for tags