fixed table id and add row ids