Updated query terms to use new argument format
Added args term, fixes #93