More exception handling for long runs
No longer using yields for large queries. Instead using own range query.
Some minor refactoring and update to the extract utility