improved tags management