Updated to match nulls in orders