fix(code): Update code following refactor of tables (refs #4621)
Merge pull request #28 from eguaj/3.3-A4621

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