making event matching more robust