Add data-geometry and data-type on tr element and remove the geometry we-invisible column
Merge from jvanulde
Merged latest from @jolvesque