Use all command line arguments for queries.
Merge pull request #1 from mythmon/patch-1

Use all command line arguments for queries.