CSD - PV Ordering Options and related fixes