Fixes #1057 More Database LIMIT concerns
Merge pull request #1084 from PirataNervo/featurefix-1057

Fixes #1057 More Database LIMIT concerns