Fixes #1057 More Database LIMIT concerns

1.6 #1057