Query Auto-retry with Primary Stop