Minor refactoring
Add range query to help section of template
Cleanup
Refactor cli query parser