removed String/ fixed tags