fix(code): Update code following refactor of tables (refs #4612)
Merge pull request #4 from eguaj/3.3-A4612

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