Make sure we actually wait until delete_by_query is done, the good way (without using wait_for_completion) - II