Improve failure handling

makes control connection queries retry with backoff and other improvements