Fix DiG query retry and fail-over issues

This MR intends to fix the issue described in #3407 (closed) and simplify the "retry and fail-over" logic for the failed queries.

Closes #3407 (closed)