Changed format of tags