Class leading again + extra sql addition for tags