table fields fixes