Allow to ask for query count
Add some options TODOs
Fix typo