Fixed saving/loading of table data