Fixing problem with already existing tags