Fix case where queries and events was not updated when using -b and -e command line. Thanks to Nicolas Thauvin for the report.