FIX match empty composite with resolver