Fixed the other tags