fixed issues from new table implementation