Added switch on CR best candidate selection coherent with SR selection