EZP-22564: simplify: use multi_match