Added the QueryParser, Query from command-line