[fix] [minor] match condition fixes for customer and supplier