Ensure that criteria expression list order is maintained