Fixed problems with TableModel/Data json encoding