Update instead of overwrite table
Fixed table number parsing