Yet another attempt to fix tags system