Merge pull request #77 from BrandyMint/aleksxor/fix-multi-table

fix for multi-table pages
Merge remote-tracking branch 'origin/master' into testing