Fixes #1057 More Database LIMIT concerns

1.8 #1057