Secondary AR: follow sample state correctly
Fix date column sorting