Fixing issues with tags