add table on fetch
Merge pull request #529 from WellingGuzman/issue-558

add table on fetch