Find actual row count without LIMITs applied

Addresses #542
removed line by accident
increased limit back to 30
Merge pull request #544 from TheSerapher/issue-542

Issue 542