Better table scan
Merge pull request #850 from mfalesni/more-move-to

Better table scan