Another attempt to fix tags system