Updated forwarding face selection