Better polish up of empty tags