Added --add-query and --run options
Added --add-query and --run options