Rework query struct for table (fixes #24)
Merge pull request #26 from nabeken/rework-query-for-table

Rework query struct for table (fixes #24)