diff --git a/name.abuchen.portfolio.tests/src/name/abuchen/portfolio/datatransfer/pdf/quirinbankag/QuirinPrivatbankAGPDFExtractorTest.java b/name.abuchen.portfolio.tests/src/name/abuchen/portfolio/datatransfer/pdf/quirinbankag/QuirinPrivatbankAGPDFExtractorTest.java
index 6c74f08d94..4ca7ad317a 100644
--- a/name.abuchen.portfolio.tests/src/name/abuchen/portfolio/datatransfer/pdf/quirinbankag/QuirinPrivatbankAGPDFExtractorTest.java
+++ b/name.abuchen.portfolio.tests/src/name/abuchen/portfolio/datatransfer/pdf/quirinbankag/QuirinPrivatbankAGPDFExtractorTest.java
@@ -280,7 +280,7 @@ public void testWertpapierKauf04()
 
         // check taxes transaction
         assertThat(results, hasItem(taxes( //
-                        hasDate("2014-03-10T00:00"), hasShares(0.1320), //
+                        hasDate("2014-03-10T00:00"), hasShares(0.1318), //
                         hasSource("Kauf04.txt"), //
                         hasNote("Zwischengewinn 0,17 EUR | Ref.-Nr.: O:002831939:1"), //
                         hasAmount("EUR", 0.05), hasGrossValue("EUR", 0.05), //
diff --git a/name.abuchen.portfolio/src/name/abuchen/portfolio/datatransfer/pdf/DZBankGruppePDFExtractor.java b/name.abuchen.portfolio/src/name/abuchen/portfolio/datatransfer/pdf/DZBankGruppePDFExtractor.java
index 66e08716ef..0a27e278fc 100644
--- a/name.abuchen.portfolio/src/name/abuchen/portfolio/datatransfer/pdf/DZBankGruppePDFExtractor.java
+++ b/name.abuchen.portfolio/src/name/abuchen/portfolio/datatransfer/pdf/DZBankGruppePDFExtractor.java
@@ -72,15 +72,15 @@ private void addBuySellTransaction()
         final DocumentType type = new DocumentType("Wertpapier Abrechnung (Kauf|Verkauf)", jointAccount);
         this.addDocumentTyp(type);
 
-        // Handshake for tax refund transaction
-        Map<String, String> context = type.getCurrentContext();
-
         Transaction<BuySellEntry> pdfTransaction = new Transaction<>();
 
         Block firstRelevantLine = new Block("^Wertpapier Abrechnung (Kauf|Verkauf).*$");
         type.addBlock(firstRelevantLine);
         firstRelevantLine.set(pdfTransaction);
 
+        // Map for tax lost adjustment transaction
+        Map<String, String> context = type.getCurrentContext();
+
         pdfTransaction //
 
                         .subject(() -> {
@@ -112,11 +112,6 @@ private void addBuySellTransaction()
                                 v.put("name", trim(v.get("name")) + " " + trim(v.get("name1")));
 
                             t.setSecurity(getOrCreateSecurity(v));
-
-                            // Handshake, if there is a tax refund
-                            context.put("name", v.get("name"));
-                            context.put("isin", v.get("isin"));
-                            context.put("wkn", v.get("wkn"));
                         })
 
                         // @formatter:off
@@ -124,12 +119,7 @@ private void addBuySellTransaction()
                         // @formatter:on
                         .section("shares") //
                         .match("^St.ck (?<shares>[\\.,\\d]+) .*$") //
-                        .assign((t, v) -> {
-                            t.setShares(asShares(v.get("shares")));
-
-                            // Handshake, if there is a tax refund
-                            context.put("shares", v.get("shares"));
-                        })
+                        .assign((t, v) -> t.setShares(asShares(v.get("shares"))))
 
                         // @formatter:off
                         // Schlusstag/-Zeit 17.02.2021 09:04:10 Auftraggeber Max Mustermann
@@ -158,11 +148,24 @@ private void addBuySellTransaction()
                         .match("^(?<note>(Limit|Stoplimit) .*)$") //
                         .assign((t, v) -> t.setNote(trim(v.get("note"))))
 
-                        .wrap(BuySellEntryItem::new);
+                        .wrap(t -> {
+                            BuySellEntryItem item = new BuySellEntryItem(t);
+
+                            // @formatter:off
+                            // Handshake for tax lost adjustment transaction
+                            // Also use number for that is also used to (later) convert it back to a number
+                            // @formatter:on
+                            context.put("name", item.getSecurity().getName());
+                            context.put("isin", item.getSecurity().getIsin());
+                            context.put("wkn", item.getSecurity().getWkn());
+                            context.put("shares", Long.toString(item.getShares()));
+
+                            return item;
+                        });
 
         addTaxesSectionsTransaction(pdfTransaction, type);
         addFeesSectionsTransaction(pdfTransaction, type);
-        addTaxReturnBlock(context, type);
+        addTaxLostAdjustmentTransaction(context, type);
     }
 
     private void addDividendeTransaction()
@@ -954,7 +957,7 @@ public void addDepotStatementTransaction()
                 });
     }
 
-    private void addTaxReturnBlock(Map<String, String> context, DocumentType type)
+    private void addTaxLostAdjustmentTransaction(Map<String, String> context, DocumentType type)
     {
         Transaction<AccountTransaction> pdfTransaction = new Transaction<>();
 
@@ -979,11 +982,11 @@ private void addTaxReturnBlock(Map<String, String> context, DocumentType type)
                         .match("^Den Gegenwert buchen wir mit Valuta (?<date>[\\d]{2}\\.[\\d]{2}\\.[\\d]{4}) .*$") //
                         .assign((t, v) -> {
                             t.setDateTime(asDate(v.get("date")));
-                            t.setCurrencyCode(asCurrencyCode(v.get("currency")));
-                            t.setAmount(asAmount(v.get("amount")));
-                            t.setShares(asShares(context.get("shares")));
-
+                            t.setShares(Long.parseLong(context.get("shares")));
                             t.setSecurity(getOrCreateSecurity(context));
+
+                            t.setCurrencyCode(asCurrencyCode(v.get("currency")));
+                            t.setAmount(asAmount(v.get("amount")));                     
                         })
 
                         // @formatter:off
diff --git a/name.abuchen.portfolio/src/name/abuchen/portfolio/datatransfer/pdf/Direkt1822BankPDFExtractor.java b/name.abuchen.portfolio/src/name/abuchen/portfolio/datatransfer/pdf/Direkt1822BankPDFExtractor.java
index ca4c472459..b10bb4edc3 100644
--- a/name.abuchen.portfolio/src/name/abuchen/portfolio/datatransfer/pdf/Direkt1822BankPDFExtractor.java
+++ b/name.abuchen.portfolio/src/name/abuchen/portfolio/datatransfer/pdf/Direkt1822BankPDFExtractor.java
@@ -6,6 +6,7 @@
 import static name.abuchen.portfolio.util.TextUtil.trim;
 
 import java.math.BigDecimal;
+import java.util.Map;
 
 import name.abuchen.portfolio.Messages;
 import name.abuchen.portfolio.datatransfer.ExtrExchangeRate;
@@ -40,7 +41,6 @@ public Direkt1822BankPDFExtractor(Client client)
         addBuySellTransaction();
         addDividendeTransaction();
         addAdvanceTaxTransaction();
-        addTaxesLostAdjustmentTransaction();
         addAccountStatementTransaction();
         addNonImportableTransaction();
     }
@@ -62,6 +62,9 @@ private void addBuySellTransaction()
         type.addBlock(firstRelevantLine);
         firstRelevantLine.set(pdfTransaction);
 
+        // Map for tax lost adjustment transaction
+        Map<String, String> context = type.getCurrentContext();
+
         pdfTransaction //
 
                         .subject(() -> {
@@ -161,10 +164,24 @@ private void addBuySellTransaction()
 
                         .conclude(ExtractorUtils.fixGrossValueBuySell())
 
-                        .wrap(BuySellEntryItem::new);
+                        .wrap(t -> {
+                            BuySellEntryItem item = new BuySellEntryItem(t);
+
+                            // @formatter:off
+                            // Handshake for tax lost adjustment transaction
+                            // Also use number for that is also used to (later) convert it back to a number
+                            // @formatter:on
+                            context.put("name", item.getSecurity().getName());
+                            context.put("isin", item.getSecurity().getIsin());
+                            context.put("wkn", item.getSecurity().getWkn());
+                            context.put("shares", Long.toString(item.getShares()));
+
+                            return item;
+                        });
 
         addTaxesSectionsTransaction(pdfTransaction, type);
         addFeesSectionsTransaction(pdfTransaction, type);
+        addTaxLostAdjustmentTransaction(context, type);
     }
 
     private void addDividendeTransaction()
@@ -319,15 +336,8 @@ private void addAdvanceTaxTransaction()
                         .wrap(TransactionItem::new);
     }
 
-    private void addTaxesLostAdjustmentTransaction()
+    private void addTaxLostAdjustmentTransaction(Map<String, String> context, DocumentType type)
     {
-        DocumentType type = new DocumentType("(Wertpapier Abrechnung (Verkauf|(Ausgabe|R.cknahme) Investmentfonds)" //
-                        + "|Gutschrift von .*" //
-                        + "|Aussch.ttung Investmentfonds" //
-                        + "|Aussch.ttung aus Genussschein" //
-                        + "|Dividendengutschrift)");
-        this.addDocumentTyp(type);
-
         Transaction<AccountTransaction> pdfTransaction = new Transaction<>();
 
         Block firstRelevantLine = new Block("^Postfach.*$");
@@ -342,99 +352,24 @@ private void addTaxesLostAdjustmentTransaction()
                             return accountTransaction;
                         })
 
-                        .oneOf( //
-                                        // @formatter:off
-                                        // Stück 13 COMSTA.-MSCI EM.MKTS.TRN U.ETF LU0635178014 (ETF127)
-                                        // INHABER-ANTEILE I O.N.
-                                        // Börse Außerbörslich (gemäß Weisung)
-                                        // Ausführungskurs 40,968 EUR Auftragserteilung Online-Banking
-                                        // @formatter:on
-                                        section -> section //
-                                                        .attributes("name", "isin", "wkn", "name1", "currency") //
-                                                        .match("^St.ck [\\.,\\d]+ (?<name>.*) (?<isin>[A-Z]{2}[A-Z0-9]{9}[0-9]) \\((?<wkn>[A-Z0-9]{6})\\)$") //
-                                                        .match("(?<name1>.*)$") //
-                                                        .match("^Ausf.hrungskurs [\\.,\\d]+ (?<currency>[\\w]{3}) .*$") //
-                                                        .assign((t, v) -> {
-                                                            if (!v.get("name1").startsWith("Börse"))
-                                                                v.put("name", trim(v.get("name")) + " " + trim(v.get("name1")));
-
-                                                            t.setSecurity(getOrCreateSecurity(v));
-                                                        }),
-                                        // @formatter:off
-                                        // Stück 920 ISHSIV-FA.AN.HI.YI.CO.BD U.ETF IE00BYM31M36 (A2AFCX)
-                                        // REGISTERED SHARES USD O.N.
-                                        // Zahlbarkeitstag 29.12.2017 Ertrag pro St. 0,123000000 USD
-                                        // @formatter:on
-                                        section -> section //
-                                                        .attributes("name", "isin", "wkn", "nameContinued", "currency") //
-                                                        .match("^St.ck [\\.,\\d]+ (?<name>.*) (?<isin>[A-Z]{2}[A-Z0-9]{9}[0-9]) \\((?<wkn>[A-Z0-9]{6})\\)$") //
-                                                        .match("(?<nameContinued>.*)") //
-                                                        .match("^Zahlbarkeitstag [\\d]{2}\\.[\\d]{2}\\.[\\d]{4} (Aussch.ttung|Dividende|Ertrag) pro (St\\.|St.ck) [\\.,\\d]+ (?<currency>[\\w]{3})$") //
-                                                        .assign((t, v) -> t.setSecurity(getOrCreateSecurity(v))))
-
-                        // @formatter:off
-                        // Stück 13 COMSTA.-MSCI EM.MKTS.TRN U.ETF LU0635178014 (ETF127)
-                        // @formatter:on
-                        .section("shares") //
-                        .match("^St.ck (?<shares>[\\.,\\d]+) .* [A-Z]{2}[A-Z0-9]{9}[0-9] \\([A-Z0-9]{6}\\)$") //
-                        .assign((t, v) -> t.setShares(asShares(v.get("shares"))))
-
-                        .oneOf( //
-                                        // @formatter:off
-                                        // Schlusstag/-Zeit 01.12.2017 10:30:52 Auftraggeber Mustermann, Max
-                                        // @formatter:on
-                                        section -> section //
-                                                        .attributes("date", "time") //
-                                                        .match("^Schlusstag\\/\\-Zeit (?<date>[\\d]{2}\\.[\\d]{2}\\.[\\d]{4}) (?<time>[\\d]{2}:[\\d]{2}:[\\d]{2}) .*$") //
-                                                        .assign((t, v) -> t.setDateTime(asDate(v.get("date"), v.get("time")))),
-                                        // @formatter:off
-                                        // Schlusstag 09.07.2021 Auftraggeber Mustermann, Max
-                                        // @formatter:on
-                                        section -> section //
-                                                        .attributes("date") //
-                                                        .match("^Schlusstag (?<date>[\\d]{2}\\.[\\d]{2}\\.[\\d]{4}) .*$") //
-                                                        .assign((t, v) -> t.setDateTime(asDate(v.get("date")))),
-                                        // @formatter:off
-                                        // Den Betrag buchen wir mit Wertstellung 03.01.2018 zu Gunsten des Kontos xxxxxxxxxx (IBAN DExx xxxx xxxx xxxx
-                                        // @formatter:on
-                                        section -> section //
-                                                        .attributes("date") //
-                                                        .match("^Den Betrag buchen wir mit Wertstellung (?<date>[\\d]{2}\\.[\\d]{2}\\.[\\d]{4}).*$") //
-                                                        .assign((t, v) -> t.setDateTime(asDate(v.get("date")))))
-
                         // @formatter:off
                         // Steuerliche Ausgleichrechnung
                         // Ausmachender Betrag 3,49 EUR
+                        // Den Gegenwert buchen wir mit Valuta 18.11.2024 zu Gunsten des Kontos 0123456789
                         // @formatter:on
-                        .section("currency", "amount").optional() //
-                        .find("Steuerliche Ausgleichrechnung")
+                        .section("currency", "amount", "date").optional() //
+                        .find("Steuerliche Ausgleichrechnung") //
                         .match("^Ausmachender Betrag (?<amount>[\\.,\\d]+)([\\-|\\+])? (?<currency>[\\w]{3})$") //
+                        .match("^Den Gegenwert buchen wir mit Valuta (?<date>[\\d]{2}\\.[\\d]{2}\\.[\\d]{4}).*$") //
                         .assign((t, v) -> {
-                            t.setAmount(asAmount(v.get("amount")));
+                            t.setDateTime(asDate(v.get("date")));
+                            t.setShares(Long.parseLong(context.get("shares")));
+                            t.setSecurity(getOrCreateSecurity(context));
+
                             t.setCurrencyCode(asCurrencyCode(v.get("currency")));
+                            t.setAmount(asAmount(v.get("amount")));
                         })
 
-                        .optionalOneOf( //
-                                        // @formatter:off
-                                        // Devisenkurs (EUR/USD) 1,1987 vom 02.03.2021
-                                        // Steuerliche Ausgleichrechnung
-                                        // Ausmachender Betrag 3,49 EUR
-                                        // @formatter:on
-                                        section -> section //
-                                                        .attributes("baseCurrency", "termCurrency", "exchangeRate", "gross") //
-                                                        .match("^Devisenkurs \\((?<baseCurrency>[\\w]{3})\\/(?<termCurrency>[\\w]{3})\\) (?<exchangeRate>[\\.,\\d]+) .*$") //
-                                                        .find("Steuerliche Ausgleichrechnung") //
-                                                        .match("^Ausmachender Betrag (?<gross>[\\.,\\d]+)([\\-|\\+])? [\\w]{3}$") //
-                                                        .assign((t, v) -> {
-                                                            ExtrExchangeRate rate = asExchangeRate(v);
-                                                            type.getCurrentContext().putType(rate);
-
-                                                            Money gross = Money.of(rate.getBaseCurrency(), asAmount(v.get("gross")));
-                                                            Money fxGross = rate.convert(rate.getTermCurrency(), gross);
-
-                                                            checkAndSetGrossUnit(gross, fxGross, t, type.getCurrentContext());
-                                                        }))
-
                         // @formatter:off
                         // Auftragsnummer 123456/10.00
                         // @formatter:on
diff --git a/name.abuchen.portfolio/src/name/abuchen/portfolio/datatransfer/pdf/DkbPDFExtractor.java b/name.abuchen.portfolio/src/name/abuchen/portfolio/datatransfer/pdf/DkbPDFExtractor.java
index a062466d1a..7ec2b40ce8 100644
--- a/name.abuchen.portfolio/src/name/abuchen/portfolio/datatransfer/pdf/DkbPDFExtractor.java
+++ b/name.abuchen.portfolio/src/name/abuchen/portfolio/datatransfer/pdf/DkbPDFExtractor.java
@@ -109,7 +109,7 @@ private void addBuySellTransaction()
         type.addBlock(firstRelevantLine);
         firstRelevantLine.set(pdfTransaction);
 
-        // Handshake for tax refund transaction
+        // Map for tax lost adjustment transaction
         Map<String, String> context = type.getCurrentContext();
 
         pdfTransaction //
@@ -164,16 +164,7 @@ private void addBuySellTransaction()
                                                         .match("^St.ck [\\.,\\d]+ (?<name>.*) (?<isin>[A-Z]{2}[A-Z0-9]{9}[0-9]) \\((?<wkn>.*)\\)$") //
                                                         .match("^(?<nameContinued>.*)$") //
                                                         .match("^(Ausf.hrungskurs|Abrech\\.\\-Preis) [\\.,\\d]+ (?<currency>[\\w]{3}).*$") //
-                                                        .assign((t, v) -> {
-                                                            t.setSecurity(getOrCreateSecurity(v));
-
-                                                            // @formatter:off
-                                                            // Handshake for tax refund transaction
-                                                            // @formatter:on
-                                                            context.put("name", t.getPortfolioTransaction().getSecurity().getName());
-                                                            context.put("isin", t.getPortfolioTransaction().getSecurity().getIsin());
-                                                            context.put("wkn", t.getPortfolioTransaction().getSecurity().getWkn());
-                                                        }),
+                                                        .assign((t, v) -> t.setSecurity(getOrCreateSecurity(v))),
                                         // @formatter:off
                                         // Nominale Wertpapierbezeichnung ISIN (WKN)
                                         // EUR 2.000,00 8,75 % METALCORP GROUP B.V. DE000A1HLTD2 (A1HLTD)
@@ -184,16 +175,7 @@ private void addBuySellTransaction()
                                                         .find("Nominale Wertpapierbezeichnung ISIN \\(WKN\\)") //
                                                         .match("^(?<currency>[\\w]{3}) [\\.,\\d]+ (?<name>.*) (?<isin>[A-Z]{2}[A-Z0-9]{9}[0-9]) \\((?<wkn>.*)\\)$") //
                                                         .match("^(?<nameContinued>.*)$") //
-                                                        .assign((t, v) -> {
-                                                            t.setSecurity(getOrCreateSecurity(v));
-
-                                                            // @formatter:off
-                                                            // Handshake for tax refund transaction
-                                                            // @formatter:on
-                                                            context.put("name", t.getPortfolioTransaction().getSecurity().getName());
-                                                            context.put("isin", t.getPortfolioTransaction().getSecurity().getIsin());
-                                                            context.put("wkn", t.getPortfolioTransaction().getSecurity().getWkn());
-                                                        }))
+                                                        .assign((t, v) -> t.setSecurity(getOrCreateSecurity(v))))
 
                         // @formatter:off
                         // EUR 2.000,00 8,75 % METALCORP GROUP B.V. DE000A1HLTD2 (A1HLTD)
@@ -213,12 +195,6 @@ private void addBuySellTransaction()
                             {
                                 t.setShares(asShares(v.get("shares")));
                             }
-
-                            // @formatter:off
-                            // Use number for that is also used to (later) convert it back to a number
-                            // @formatter:on
-                            context.put("shares", getNumberFormat() //
-                                            .format(t.getPortfolioTransaction().getShares() / Values.Share.divider()));
                         })
 
                         // @formatter:off
@@ -299,12 +275,21 @@ private void addBuySellTransaction()
                             if (ctx.getString(FAILURE) != null)
                                 item.setFailureMessage(ctx.getString(FAILURE));
 
+                            // @formatter:off
+                            // Handshake for tax lost adjustment transaction
+                            // Also use number for that is also used to (later) convert it back to a number
+                            // @formatter:on
+                            context.put("name", item.getSecurity().getName());
+                            context.put("isin", item.getSecurity().getIsin());
+                            context.put("wkn", item.getSecurity().getWkn());
+                            context.put("shares", Long.toString(item.getShares()));
+
                             return item;
                         });
 
         addTaxesSectionsTransaction(pdfTransaction, type);
         addFeesSectionsTransaction(pdfTransaction, type);
-        addTaxReturnBlock(context, type);
+        addTaxLostAdjustmentTransaction(context, type);
     }
 
     private void addDividendeTransaction()
@@ -1447,7 +1432,7 @@ private void addCreditcardStatementTransaction()
                         .wrap(TransactionItem::new));
     }
 
-    private void addTaxReturnBlock(Map<String, String> context, DocumentType type)
+    private void addTaxLostAdjustmentTransaction(Map<String, String> context, DocumentType type)
     {
         Transaction<AccountTransaction> pdfTransaction = new Transaction<>();
 
@@ -1472,7 +1457,7 @@ private void addTaxReturnBlock(Map<String, String> context, DocumentType type)
                         .match("^Den Gegenwert buchen wir mit Valuta (?<date>[\\d]{2}\\.[\\d]{2}\\.[\\d]{4}) .*$") //
                         .assign((t, v) -> {
                             t.setDateTime(asDate(v.get("date")));
-                            t.setShares(asShares(context.get("shares")));
+                            t.setShares(Long.parseLong(context.get("shares")));
                             t.setSecurity(getOrCreateSecurity(context));
 
                             t.setCurrencyCode(asCurrencyCode(v.get("currency")));
diff --git a/name.abuchen.portfolio/src/name/abuchen/portfolio/datatransfer/pdf/ErsteBankPDFExtractor.java b/name.abuchen.portfolio/src/name/abuchen/portfolio/datatransfer/pdf/ErsteBankPDFExtractor.java
index e0cd843fca..317c1bacb1 100644
--- a/name.abuchen.portfolio/src/name/abuchen/portfolio/datatransfer/pdf/ErsteBankPDFExtractor.java
+++ b/name.abuchen.portfolio/src/name/abuchen/portfolio/datatransfer/pdf/ErsteBankPDFExtractor.java
@@ -64,7 +64,7 @@ private void addBuySellTransaction_DocFormat01()
         type.addBlock(firstRelevantLine);
         firstRelevantLine.set(pdfTransaction);
 
-        // Handshake for tax refund transaction
+        // Map for tax lost adjustment transaction
         Map<String, String> context = type.getCurrentContext();
 
         pdfTransaction //
@@ -96,17 +96,7 @@ private void addBuySellTransaction_DocFormat01()
                                                         .match("^Wertpapier: (?<name>.*) .*: [\\w]{3} [\\.,\\d]+(\\-)?$") //
                                                         .match("^(?<nameContinued>.*) .*: [\\w]{3} [\\.,\\d]+(\\-)?$") //
                                                         .match("^WP\\-Kenn\\-Nr.*: (?<isin>[A-Z]{2}[A-Z0-9]{9}[0-9]).*$") //
-                                                        .assign((t, v) -> {
-                                                            t.setSecurity(getOrCreateSecurity(v));
-
-                                                            // @formatter:off
-                                                            // Handshake for tax refund transaction
-                                                            // @formatter:on
-                                                            context.put("name", t.getPortfolioTransaction().getSecurity().getName());
-                                                            context.put("isin", t.getPortfolioTransaction().getSecurity().getIsin());
-                                                            context.put("currency", t.getPortfolioTransaction().getSecurity().getCurrencyCode());
-
-                                                        }),
+                                                        .assign((t, v) -> t.setSecurity(getOrCreateSecurity(v))),
                                         // @formatter:off
                                         // Börse: Vienna Stock Exchange Kurswert: EUR 3.207,23
                                         // Wertpapier: VOESTALPINE AG AKT. Tradinggebühren: EUR 9,99
@@ -125,13 +115,6 @@ private void addBuySellTransaction_DocFormat01()
                                                                 v.put("name", v.get("name") + " " + v.get("name1"));
 
                                                             t.setSecurity(getOrCreateSecurity(v));
-
-                                                            // @formatter:off
-                                                            // Handshake for tax refund transaction
-                                                            // @formatter:on
-                                                            context.put("name", t.getPortfolioTransaction().getSecurity().getName());
-                                                            context.put("isin", t.getPortfolioTransaction().getSecurity().getIsin());
-                                                            context.put("currency", t.getPortfolioTransaction().getSecurity().getCurrencyCode());
                                                         }),
                                         // @formatter:off
                                         // Börse: Vienna Stock Exchange Kurswert: EUR 1.049,40
@@ -145,17 +128,7 @@ private void addBuySellTransaction_DocFormat01()
                                                         .match("^Wertpapier: (?<name>.*)$") //
                                                         .match("^(?<nameContinued>.*)$") //
                                                         .match("^WP\\-Kenn\\-Nr.*: (?<isin>[A-Z]{2}[A-Z0-9]{9}[0-9]) .*: [\\w]{3} [\\.,\\d]+(\\-)?$") //
-                                                        .assign((t, v) -> {
-                                                            t.setSecurity(getOrCreateSecurity(v));
-
-                                                            // @formatter:off
-                                                            // Handshake for tax refund transaction
-                                                            // @formatter:on
-                                                            context.put("name", t.getPortfolioTransaction().getSecurity().getName());
-                                                            context.put("isin", t.getPortfolioTransaction().getSecurity().getIsin());
-                                                            context.put("currency", t.getPortfolioTransaction().getSecurity().getCurrencyCode());
-
-                                                        }),
+                                                        .assign((t, v) -> t.setSecurity(getOrCreateSecurity(v))),
                                         // @formatter:off
                                         // Börse: Vienna Stock Exchange Kurswert: EUR 1.132,20
                                         // Wertpapier: EVN STAMMAKTIEN O.N. WP-Kommission: EUR 9,99
@@ -166,17 +139,7 @@ private void addBuySellTransaction_DocFormat01()
                                                         .match("^.* Kurswert: (?<currency>[\\w]{3}) [\\.,\\d]+$") //
                                                         .match("^Wertpapier: (?<name>.*) .*: [\\w]{3} [\\.,\\d]+(\\-)?$") //
                                                         .match("^WP\\-Kenn\\-Nr.*: (?<isin>[A-Z]{2}[A-Z0-9]{9}[0-9]).*$") //
-                                                        .assign((t, v) -> {
-                                                            t.setSecurity(getOrCreateSecurity(v));
-
-                                                            // @formatter:off
-                                                            // Handshake for tax refund transaction
-                                                            // @formatter:on
-                                                            context.put("name", t.getPortfolioTransaction().getSecurity().getName());
-                                                            context.put("isin", t.getPortfolioTransaction().getSecurity().getIsin());
-                                                            context.put("currency", t.getPortfolioTransaction().getSecurity().getCurrencyCode());
-
-                                                        }),
+                                                        .assign((t, v) -> t.setSecurity(getOrCreateSecurity(v))),
                                         // @formatter:off
                                         // Ausserbörslich Kurswert: EUR 99,97
                                         // Wertpapier: DWS TOP 50 WELT KESt II EUR 0,02-
@@ -187,17 +150,7 @@ private void addBuySellTransaction_DocFormat01()
                                                         .match("^.* Kurswert: (?<currency>[\\w]{3}) [\\.,\\d]+$") //
                                                         .match("^Wertpapier: (?<name>.*) KESt.* [\\w]{3} [\\.,\\d]+(\\-)?$") //
                                                         .match("^WP\\-Kenn\\-Nr.*: (?<isin>[A-Z]{2}[A-Z0-9]{9}[0-9]).*$") //
-                                                        .assign((t, v) -> {
-                                                            t.setSecurity(getOrCreateSecurity(v));
-
-                                                            // @formatter:off
-                                                            // Handshake for tax refund transaction
-                                                            // @formatter:on
-                                                            context.put("name", t.getPortfolioTransaction().getSecurity().getName());
-                                                            context.put("isin", t.getPortfolioTransaction().getSecurity().getIsin());
-                                                            context.put("currency", t.getPortfolioTransaction().getSecurity().getCurrencyCode());
-
-                                                        }),
+                                                        .assign((t, v) -> t.setSecurity(getOrCreateSecurity(v))),
                                         // @formatter:off
                                         // Ausserbörslich Kurswert: EUR 99,97
                                         // Wertpapier: DWS TOP 50 WELT
@@ -208,17 +161,7 @@ private void addBuySellTransaction_DocFormat01()
                                                         .match("^.* Kurswert: (?<currency>[\\w]{3}) [\\.,\\d]+$") //
                                                         .match("^Wertpapier: (?<name>.*)$") //
                                                         .match("^WP\\-Kenn\\-Nr.*: (?<isin>[A-Z]{2}[A-Z0-9]{9}[0-9])$") //
-                                                        .assign((t, v) -> {
-                                                            t.setSecurity(getOrCreateSecurity(v));
-
-                                                            // @formatter:off
-                                                            // Handshake for tax refund transaction
-                                                            // @formatter:on
-                                                            context.put("name", t.getPortfolioTransaction().getSecurity().getName());
-                                                            context.put("isin", t.getPortfolioTransaction().getSecurity().getIsin());
-                                                            context.put("currency", t.getPortfolioTransaction().getSecurity().getCurrencyCode());
-
-                                                        }))
+                                                        .assign((t, v) -> t.setSecurity(getOrCreateSecurity(v))))
 
                         // @formatter:off
                         // Stück: 105,00
@@ -226,14 +169,7 @@ private void addBuySellTransaction_DocFormat01()
                         // @formatter:on
                         .section("shares") //
                         .match("^St.ck: (?<shares>[\\.,\\d]+).*$") //
-                        .assign((t, v) -> {
-                            t.setShares(asShares(v.get("shares")));
-
-                            // @formatter:off
-                            // Use number for that is also used to (later) convert it back to a number
-                            // @formatter:on
-                            context.put("shares", getNumberFormat().format(t.getPortfolioTransaction().getShares() / Values.Share.divider()));
-                        })
+                        .assign((t, v) -> t.setShares(asShares(v.get("shares"))))
 
                         // @formatter:off
                         // Ausführungsdatum: 23.09.2015 Ausführungszeit: 09:02:20
@@ -368,22 +304,28 @@ private void addBuySellTransaction_DocFormat01()
                         // @formatter:on
                         .section("note").optional() //
                         .match("^.*(Referenz Nr.*|Auftragsnummer) (?<note>.*)$") //
-                        .assign((t, v) -> {
-                            t.setNote("Ref.-Nr.: " + trim(v.get("note")));
+                        .assign((t, v) -> t.setNote("Ref.-Nr.: " + trim(v.get("note"))))
+
+                        .conclude(ExtractorUtils.fixGrossValueBuySell())
+
+                        .wrap(t -> {
+                            BuySellEntryItem item = new BuySellEntryItem(t);
 
                             // @formatter:off
-                            // Handshake for tax refund transaction
+                            // Handshake for tax lost adjustment transaction
+                            // Also use number for that is also used to (later) convert it back to a number
                             // @formatter:on
-                            context.put("note", t.getNote());
-                        })
+                            context.put("name", item.getSecurity().getName());
+                            context.put("isin", item.getSecurity().getIsin());
+                            context.put("wkn", item.getSecurity().getWkn());
+                            context.put("shares", Long.toString(item.getShares()));
 
-                        .conclude(ExtractorUtils.fixGrossValueBuySell())
-
-                        .wrap(BuySellEntryItem::new);
+                            return item;
+                        });
 
         addTaxesSectionsTransaction(pdfTransaction, type);
         addFeesSectionsTransaction(pdfTransaction, type);
-        addTaxReturnBlock_DocFormat01(context, type);
+        addTaxLostAdjustmentTransaction(context, type);
     }
 
     private void addBuySellTransaction_DocFormat02()
@@ -992,11 +934,11 @@ private void addCertificateOfLostAdjustmentTransaction()
                         .wrap(TransactionItem::new);
     }
 
-    private void addTaxReturnBlock_DocFormat01(Map<String, String> context, DocumentType type)
+    private void addTaxLostAdjustmentTransaction(Map<String, String> context, DocumentType type)
     {
         Transaction<AccountTransaction> pdfTransaction = new Transaction<>();
 
-        Block firstRelevantLine = new Block("^.* KESt( [A-Z]{1,3})? [\\w]{3} [\\.,\\d]+\\-$");
+        Block firstRelevantLine = new Block("^.*Referenz Nr.*$");
         type.addBlock(firstRelevantLine);
         firstRelevantLine.set(pdfTransaction);
 
@@ -1014,13 +956,11 @@ private void addTaxReturnBlock_DocFormat01(Map<String, String> context, Document
                         .section("amount", "currency").optional() //
                         .match("^.* KESt( [A-Z]{1,3})? (?<currency>[\\w]{3}) (?<amount>[\\.,\\d]+)\\-$") //
                         .assign((t, v) -> {
-                            t.setShares(asShares(context.get("shares")));
+                            t.setShares(Long.parseLong(context.get("shares")));
                             t.setSecurity(getOrCreateSecurity(context));
 
                             t.setCurrencyCode(asCurrencyCode(v.get("currency")));
                             t.setAmount(asAmount(v.get("amount")));
-
-                            t.setNote(context.get("note"));
                         })
 
                         // @formatter:off
@@ -1057,6 +997,14 @@ private void addTaxReturnBlock_DocFormat01(Map<String, String> context, Document
                                                                 t.setDateTime(asDate(v.get("date")));
                                                         }))
 
+                        // @formatter:off
+                        // Abcd Abcdefghijk Referenz Nr.: 12-12345678
+                        // Ihr Auftrag vom 24.03.2020, 22:34 Uhr                                              Auftragsnummer XXXXXXXX
+                        // @formatter:on
+                        .section("note").optional() //
+                        .match("^.*(Referenz Nr.*|Auftragsnummer) (?<note>.*)$") //
+                        .assign((t, v) -> t.setNote("Ref.-Nr.: " + trim(v.get("note"))))
+
                         .wrap(t -> {
                             if (t.getCurrencyCode() != null && t.getAmount() != 0)
                                 return new TransactionItem(t);
diff --git a/name.abuchen.portfolio/src/name/abuchen/portfolio/datatransfer/pdf/MLPBankingAGPDFExtractor.java b/name.abuchen.portfolio/src/name/abuchen/portfolio/datatransfer/pdf/MLPBankingAGPDFExtractor.java
index 1626bda66f..9a11b25e88 100644
--- a/name.abuchen.portfolio/src/name/abuchen/portfolio/datatransfer/pdf/MLPBankingAGPDFExtractor.java
+++ b/name.abuchen.portfolio/src/name/abuchen/portfolio/datatransfer/pdf/MLPBankingAGPDFExtractor.java
@@ -47,7 +47,7 @@ private void addBuySellTransaction()
         type.addBlock(firstRelevantLine);
         firstRelevantLine.set(pdfTransaction);
 
-        // Handshake for tax refund transaction
+        // Map for tax lost adjustment transaction
         Map<String, String> context = type.getCurrentContext();
 
         pdfTransaction //
@@ -80,11 +80,6 @@ private void addBuySellTransaction()
                                 v.put("name", trim(v.get("name")) + " " + trim(v.get("name1")));
 
                             t.setSecurity(getOrCreateSecurity(v));
-
-                            // Handshake, if there is a tax refund
-                            context.put("name", v.get("name"));
-                            context.put("isin", v.get("isin"));
-                            context.put("wkn", v.get("wkn"));
                         })
 
                         // @formatter:off
@@ -92,12 +87,7 @@ private void addBuySellTransaction()
                         // @formatter:on
                         .section("shares").optional() //
                         .match("^St.ck (?<shares>[\\.,\\d]+) .* [A-Z]{2}[A-Z0-9]{9}[0-9] \\([A-Z0-9]{6}\\)$") //
-                        .assign((t, v) -> {
-                            t.setShares(asShares(v.get("shares")));
-
-                            // Handshake, if there is a tax refund
-                            context.put("shares", v.get("shares"));
-                        })
+                        .assign((t, v) -> t.setShares(asShares(v.get("shares"))))
 
                         // @formatter:off
                         // Schlusstag 14.01.2021
@@ -141,11 +131,24 @@ private void addBuySellTransaction()
                         .match("^(?<note>Ver.ußerungsverlust [\\.,\\d]+\\- [\\w]{3})$") //
                         .assign((t, v) -> t.setNote(trim(v.get("note"))))
 
-                        .wrap(BuySellEntryItem::new);
+                        .wrap(t -> {
+                            BuySellEntryItem item = new BuySellEntryItem(t);
+
+                            // @formatter:off
+                            // Handshake for tax lost adjustment transaction
+                            // Also use number for that is also used to (later) convert it back to a number
+                            // @formatter:on
+                            context.put("name", item.getSecurity().getName());
+                            context.put("isin", item.getSecurity().getIsin());
+                            context.put("wkn", item.getSecurity().getWkn());
+                            context.put("shares", Long.toString(item.getShares()));
+
+                            return item;
+                        });
 
         addTaxesSectionsTransaction(pdfTransaction, type);
         addFeesSectionsTransaction(pdfTransaction, type);
-        addTaxReturnBlock(context, type);
+        addTaxLostAdjustmentTransaction(context, type);
     }
 
     private void addDividendeTransaction()
@@ -462,7 +465,7 @@ private void addDepotStatementTransaction()
                         .wrap(TransactionItem::new));
     }
 
-    private void addTaxReturnBlock(Map<String, String> context, DocumentType type)
+    private void addTaxLostAdjustmentTransaction(Map<String, String> context, DocumentType type)
     {
         Transaction<AccountTransaction> pdfTransaction = new Transaction<>();
 
@@ -487,11 +490,11 @@ private void addTaxReturnBlock(Map<String, String> context, DocumentType type)
                         .match("^Den Gegenwert buchen wir mit Valuta (?<date>[\\d]{2}\\.[\\d]{2}\\.[\\d]{4}) .*$") //
                         .assign((t, v) -> {
                             t.setDateTime(asDate(v.get("date")));
+                            t.setShares(Long.parseLong(context.get("shares")));
+                            t.setSecurity(getOrCreateSecurity(context));
+
                             t.setCurrencyCode(asCurrencyCode(v.get("currency")));
                             t.setAmount(asAmount(v.get("amount")));
-                            t.setShares(asShares(context.get("shares")));
-
-                            t.setSecurity(getOrCreateSecurity(context));
                         })
 
                         .wrap(t -> {
diff --git a/name.abuchen.portfolio/src/name/abuchen/portfolio/datatransfer/pdf/NIBCBankPDFExtractor.java b/name.abuchen.portfolio/src/name/abuchen/portfolio/datatransfer/pdf/NIBCBankPDFExtractor.java
index 50d979b731..35230ec649 100644
--- a/name.abuchen.portfolio/src/name/abuchen/portfolio/datatransfer/pdf/NIBCBankPDFExtractor.java
+++ b/name.abuchen.portfolio/src/name/abuchen/portfolio/datatransfer/pdf/NIBCBankPDFExtractor.java
@@ -46,13 +46,13 @@ private void addBuySellTransaction()
             return entry;
         });
 
-        // Handshake for tax refund transaction
-        Map<String, String> context = type.getCurrentContext();
-
         Block firstRelevantLine = new Block("^Wertpapier Abrechnung (Kauf|Verkauf).*$");
         type.addBlock(firstRelevantLine);
         firstRelevantLine.set(pdfTransaction);
 
+        // Map for tax lost adjustment transaction
+        Map<String, String> context = type.getCurrentContext();
+
         pdfTransaction
                 // Is type --> "Verkauf" change from BUY to SELL
                 .section("type").optional()
@@ -76,22 +76,12 @@ private void addBuySellTransaction()
                         v.put("name", trim(v.get("name")) + " " + trim(v.get("name1")));
 
                     t.setSecurity(getOrCreateSecurity(v));
-
-                    // Handshake, if there is a tax refund
-                    context.put("name", v.get("name"));
-                    context.put("isin", v.get("isin"));
-                    context.put("wkn", v.get("wkn"));
                 })
 
                 // Stück 13 VANGUARD FTSE ALL-WORLD U.ETF      IE00B3RBWM25 (A1JX52)
                 .section("shares")
                 .match("^St.ck (?<shares>[\\.,\\d]+) .*$")
-                .assign((t, v) -> {
-                    t.setShares(asShares(v.get("shares")));
-
-                    // Handshake, if there is a tax refund
-                    context.put("shares", v.get("shares"));
-                })
+                .assign((t, v) -> t.setShares(asShares(v.get("shares"))))
 
 
                 // Schlusstag/-Zeit 13.01.2020 11:42:59 Auftraggeber Vornamen Nachnamen
@@ -112,11 +102,24 @@ private void addBuySellTransaction()
                 .match("^(?<note>(Limit|Stoplimit) .*)$")
                 .assign((t, v) -> t.setNote(trim(v.get("note"))))
 
-                .wrap(BuySellEntryItem::new);
+                .wrap(t -> {
+                    BuySellEntryItem item = new BuySellEntryItem(t);
+
+                    // @formatter:off
+                    // Handshake for tax lost adjustment transaction
+                    // Also use number for that is also used to (later) convert it back to a number
+                    // @formatter:on
+                    context.put("name", item.getSecurity().getName());
+                    context.put("isin", item.getSecurity().getIsin());
+                    context.put("wkn", item.getSecurity().getWkn());
+                    context.put("shares", Long.toString(item.getShares()));
+
+                    return item;
+                });
 
         addTaxesSectionsTransaction(pdfTransaction, type);
         addFeesSectionsTransaction(pdfTransaction, type);
-        addTaxReturnBlock(context, type);
+        addTaxLostAdjustmentTransaction(context, type);
     }
 
     private void addDividendeTransaction()
@@ -193,7 +196,7 @@ private void addDividendeTransaction()
         block.set(pdfTransaction);
     }
 
-    private void addTaxReturnBlock(Map<String, String> context, DocumentType type)
+    private void addTaxLostAdjustmentTransaction(Map<String, String> context, DocumentType type)
     {
         Block block = new Block("^Steuerliche Ausgleichrechnung$");
         type.addBlock(block);
@@ -212,11 +215,11 @@ private void addTaxReturnBlock(Map<String, String> context, DocumentType type)
                 .match("^Den Gegenwert buchen wir mit Valuta (?<date>[\\d]{2}\\.[\\d]{2}\\.[\\d]{4}) .*$")
                 .assign((t, v) -> {
                     t.setDateTime(asDate(v.get("date")));
+                    t.setShares(Long.parseLong(context.get("shares")));
+                    t.setSecurity(getOrCreateSecurity(context));
+
                     t.setCurrencyCode(asCurrencyCode(v.get("currency")));
                     t.setAmount(asAmount(v.get("amount")));
-                    t.setShares(asShares(context.get("shares")));
-
-                    t.setSecurity(getOrCreateSecurity(context));
                 })
 
                 // Verrechnete Aktienverluste 112,10- EUR
diff --git a/name.abuchen.portfolio/src/name/abuchen/portfolio/datatransfer/pdf/QuirinBankAGPDFExtractor.java b/name.abuchen.portfolio/src/name/abuchen/portfolio/datatransfer/pdf/QuirinBankAGPDFExtractor.java
index d590a87345..e222972adf 100644
--- a/name.abuchen.portfolio/src/name/abuchen/portfolio/datatransfer/pdf/QuirinBankAGPDFExtractor.java
+++ b/name.abuchen.portfolio/src/name/abuchen/portfolio/datatransfer/pdf/QuirinBankAGPDFExtractor.java
@@ -18,7 +18,6 @@
 import name.abuchen.portfolio.model.Client;
 import name.abuchen.portfolio.model.PortfolioTransaction;
 import name.abuchen.portfolio.money.Money;
-import name.abuchen.portfolio.money.Values;
 
 @SuppressWarnings("nls")
 public class QuirinBankAGPDFExtractor extends AbstractPDFExtractor
@@ -132,7 +131,7 @@ private void addBuySellTransaction_Format02()
         type.addBlock(firstRelevantLine);
         firstRelevantLine.set(pdfTransaction);
 
-        // Handshake for taxes on interim profits on purchase transaction
+        // Map for tax lost adjustment transaction
         Map<String, String> context = type.getCurrentContext();
 
         pdfTransaction //
@@ -167,16 +166,7 @@ private void addBuySellTransaction_Format02()
                                                         .match("^Nominal\\/St.ck (?<name>.*)$") //
                                                         .match("^ST [\\.,\\d]+ ISIN (?<isin>[A-Z]{2}[A-Z0-9]{9}[0-9])$") //
                                                         .match("^Kurs[\\s]{1,}[\\.,\\d]+ (?<currency>[\\w]{3}) .*$") //
-                                                        .assign((t, v) -> {
-                                                            t.setSecurity(getOrCreateSecurity(v));
-
-                                                            // @formatter:off
-                                                            // Handshake for taxes on interim profits on purchase transaction
-                                                            // @formatter:on
-                                                            context.put("name", t.getPortfolioTransaction().getSecurity().getName());
-                                                            context.put("isin", t.getPortfolioTransaction().getSecurity().getIsin());
-                                                            context.put("wkn", t.getPortfolioTransaction().getSecurity().getWkn());
-                                                        }),
+                                                        .assign((t, v) -> t.setSecurity(getOrCreateSecurity(v))),
                                         // @formatter:off
                                         // Nominal/Stück Carmignac Patrimoine FCP Act.au Port.A EUR acc o.N.
                                         // ST 0,1318 ISIN FR0010135103 WKN A0DPW0
@@ -187,16 +177,7 @@ private void addBuySellTransaction_Format02()
                                                         .match("^Nominal\\/St.ck (?<name>.*)$") //
                                                         .match("^ST [\\.,\\d]+ ISIN (?<isin>[A-Z]{2}[A-Z0-9]{9}[0-9]) WKN (?<wkn>[A-Z0-9]{6})$") //
                                                         .match("^Kurs[\\s]{1,}[\\.,\\d]+ (?<currency>[\\w]{3}) .*$") //
-                                                        .assign((t, v) -> {
-                                                            t.setSecurity(getOrCreateSecurity(v));
-
-                                                            // @formatter:off
-                                                            // Handshake for taxes on interim profits on purchase transaction
-                                                            // @formatter:on
-                                                            context.put("name", t.getPortfolioTransaction().getSecurity().getName());
-                                                            context.put("isin", t.getPortfolioTransaction().getSecurity().getIsin());
-                                                            context.put("wkn", t.getPortfolioTransaction().getSecurity().getWkn());
-                                                        }))
+                                                        .assign((t, v) -> t.setSecurity(getOrCreateSecurity(v))))
 
                         // @formatter:off
                         // ST 22 ISIN DE0007873200
@@ -204,15 +185,7 @@ private void addBuySellTransaction_Format02()
                         // @formatter:on
                         .section("shares") //
                         .match("^ST (?<shares>[\\.,\\d]+) ISIN [A-Z]{2}[A-Z0-9]{9}[0-9].*$") //
-                        .assign((t, v) -> {
-                            t.setShares(asShares(v.get("shares")));
-
-                            // @formatter:off
-                            // Use number for that is also used to (later) convert it back to a number
-                            // @formatter:on
-                            context.put("shares", getNumberFormat() //
-                                            .format(t.getPortfolioTransaction().getShares() / Values.Share.divider()));
-                        })
+                        .assign((t, v) -> t.setShares(asShares(v.get("shares"))))
 
                         .oneOf( //
                         // @formatter:off
@@ -280,11 +253,24 @@ private void addBuySellTransaction_Format02()
                         .match("^Referenz (?<note>.*)$") //
                         .assign((t, v) -> t.setNote("Ref.-Nr.: " + trim(v.get("note"))))
 
-                        .wrap(BuySellEntryItem::new);
+                        .wrap(t -> {
+                            BuySellEntryItem item = new BuySellEntryItem(t);
+
+                            // @formatter:off
+                            // Handshake for tax lost adjustment transaction
+                            // Also use number for that is also used to (later) convert it back to a number
+                            // @formatter:on
+                            context.put("name", item.getSecurity().getName());
+                            context.put("isin", item.getSecurity().getIsin());
+                            context.put("wkn", item.getSecurity().getWkn());
+                            context.put("shares", Long.toString(item.getShares()));
+
+                            return item;
+                        });
 
         addTaxesSectionsTransaction(pdfTransaction, type);
         addFeesSectionsTransaction(pdfTransaction, type);
-        addTaxesLostAdjustmentTransaction(context, type);
+        addTaxLostAdjustmentTransaction(context, type);
     }
 
     private void addDividendeTransaction_Format01()
@@ -1008,11 +994,11 @@ private void addDepotStatementTransaction()
                         .wrap(TransactionItem::new));
     }
 
-    private void addTaxesLostAdjustmentTransaction(Map<String, String> context, DocumentType type)
+    private void addTaxLostAdjustmentTransaction(Map<String, String> context, DocumentType type)
     {
         Transaction<AccountTransaction> pdfTransaction = new Transaction<>();
 
-        Block firstRelevantLine = new Block("^Kauf$");
+        Block firstRelevantLine = new Block("^(Kauf|Verkauf)$");
         type.addBlock(firstRelevantLine);
         firstRelevantLine.set(pdfTransaction);
 
@@ -1030,10 +1016,10 @@ private void addTaxesLostAdjustmentTransaction(Map<String, String> context, Docu
                         // @formatter:on
                         .section("amount", "currency", "date").optional() //
                         .match("^Verrechnungstopf Sonstige .* Steuerbetrag[\\s]{1,}(?<amount>[\\.,\\d]+) (?<currency>[\\w]{3}).*$") //
-                        .match("^Bemessungsgrundlage KESt .* Valuta (?<date>[\\d]{2}\\.[\\d]{2}\\.[\\d]{4}) .*$") //
+                        .match("^Bemessungsgrundlage KESt .* Valuta (?<date>[\\d]{2}\\.[\\d]{2}\\.[\\d]{4}).*$") //
                         .assign((t, v) -> {
                             t.setDateTime(asDate(v.get("date")));
-                            t.setShares(asShares(context.get("shares")));
+                            t.setShares(Long.parseLong(context.get("shares")));
                             t.setSecurity(getOrCreateSecurity(context));
 
                             t.setCurrencyCode(asCurrencyCode(v.get("currency")));