Fix mismatch between rp and rp_prev ordering, fix incorrect display order