Fix display of RPA when rematch available