Adding more support for failover and making sure that it does not switch to failover if the option is disabled.