changes for better handling ELB switches after fail