fix the type error and remove table row since No isnt in order