Fix top failure view for remote and functional