fix(code): Update code following refactor of tables (refs #4613)
Merge pull request #3 from eguaj/3.3-A4613

fix(code): Update code following refactor of tables (closes #4613)