Add new command line argument -p/--preserve to preserve query ID