Fixing more issues with tags