Fixes #1057 More Database LIMIT concerns
Merge pull request #1085 from PirataNervo/fix-1057

Fixes #1057 More Database LIMIT concerns