diff --git a/src/cli/org.kde.kitinerary-extractor.appdata.xml b/src/cli/org.kde.kitinerary-extractor.appdata.xml
index e79f512..dade36b 100644
--- a/src/cli/org.kde.kitinerary-extractor.appdata.xml
+++ b/src/cli/org.kde.kitinerary-extractor.appdata.xml
@@ -1,74 +1,75 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component type="desktop">
   <id>org.kde.kitinerary-extractor</id>
   <metadata_license>CC0-1.0</metadata_license>
   <project_license>LGPL-2.0+</project_license>
   <name>KItinerary Command Line Extractor</name>
   <name xml:lang="ca">Extractor de la línia d'ordres del KItinerary</name>
   <name xml:lang="en-GB">KItinerary Command Line Extractor</name>
   <name xml:lang="es">Extractor de línea de órdenes de KItinerary</name>
   <name xml:lang="et">KItinerary käsurea hankija</name>
   <name xml:lang="fi">KItineraryn komentorivijäsennin</name>
   <name xml:lang="fr">Extracteur KItinerary en ligne de commande</name>
   <name xml:lang="gl">Extractor de liña de ordes de KItinerary</name>
   <name xml:lang="id">KItinerary Command Line Extractor</name>
   <name xml:lang="it">Estrattore a riga di comando di KItinerary</name>
   <name xml:lang="nl">Extractor van opdrachtregel van KItinerary</name>
   <name xml:lang="pl">Wydobywane danych z wiersza poleceń KItinerary</name>
   <name xml:lang="pt">Extracção da Linha de Comandos do KItinerary</name>
   <name xml:lang="pt-BR">Extrator em linha de comando do KItinerary</name>
   <name xml:lang="sk">Extraktor cez príkazový riadok pre KItinerary</name>
   <name xml:lang="sv">Kitinerary extrahering på kommandoraden</name>
   <name xml:lang="uk">Командний засіб видобування KItinerary</name>
   <name xml:lang="x-test">xxKItinerary Command Line Extractorxx</name>
   <summary>Command line reservation data extractor.</summary>
   <summary xml:lang="ca">Extractor de dades de reserves de la línia d'ordres.</summary>
   <summary xml:lang="cs">Extraktor dat rezervací v příkazové řádce.</summary>
   <summary xml:lang="en-GB">Command line reservation data extractor.</summary>
   <summary xml:lang="es">Extractor de línea de órdenes de reserva de datos.</summary>
   <summary xml:lang="et">Käsurea reserveerimisandmete hankija.</summary>
   <summary xml:lang="fi">Komentorivin varaustietojäsennin.</summary>
   <summary xml:lang="fr">Extracteur de données de réservation en ligne de commande.</summary>
   <summary xml:lang="gl">Extractor de datos de reservas de liña de ordes.</summary>
   <summary xml:lang="id">Pengekstrak data reservasi baris perintah.</summary>
   <summary xml:lang="it">Estrattore di dati di prenotazioni a riga di comando.</summary>
   <summary xml:lang="nl">Gegevensextractor van reservering op de opdrachtregel.</summary>
   <summary xml:lang="pl">Wydobywane danych o rezerwacji z wiersza poleceń.</summary>
   <summary xml:lang="pt">Extracção de dados de reservas na linha de comandos.</summary>
   <summary xml:lang="pt-BR">Extrator em linha de comando de dados de reservas.</summary>
   <summary xml:lang="sk">Extraktor dát pre rezerváciu cez príkazový riadok.</summary>
   <summary xml:lang="sv">Extrahering av reservationsdata på kommandoraden</summary>
   <summary xml:lang="uk">Програма для видобування даних бронювання, керування якою відбувається з командного рядка.</summary>
   <summary xml:lang="x-test">xxCommand line reservation data extractor.xx</summary>
   <description>
     <p>
     Command line extractor for itinerary data, for integrating into 3rd party applications.
     </p>
     <p xml:lang="ca">Extractor de dades d'itineraris de la línia d'ordres, per a la integració en aplicacions de tercers.</p>
     <p xml:lang="en-GB">Command line extractor for itinerary data, for integrating into 3rd party applications.</p>
     <p xml:lang="es">Extractor de línea de órdenes para datos de itinerario. para integración en aplicaciones de terceros.</p>
     <p xml:lang="et">Käsurea reisiandmete hankija, mida lõimida kolmanda poole rakendustega.</p>
     <p xml:lang="fi">Komentorivijäsennin varaustiedoille kolmannen osapuolen sovelluksia varten.</p>
     <p xml:lang="fr">Extracteur en ligne de commande pour les données d'itinéraires, afin de les intégrer à des applications tierces.</p>
     <p xml:lang="gl">Extractor de liña de ordes de datos de itinerarios, para integrar con aplicacións de terceiros.</p>
     <p xml:lang="id">Pengekstrak baris data untuk data rencana perjalanan, untuk pengintegrasian ke dalam aplikasi pihak ketiga.</p>
     <p xml:lang="it">Estrattore a riga di comando per dati di itinerari, per l'integrazione con applicazioni di terze parti.</p>
     <p xml:lang="nl">Extractor van reisgegevens op de opdrachtregel, voor integratie in toepassingen van derden.</p>
     <p xml:lang="pl">Wydobywane danych z wiersza poleceń dla planu podróży, do zszywania z aplikacjami osób trzecich.</p>
     <p xml:lang="pt">Extracção pela linha de comandos de dados de itinerários, para se integrar com aplicações de terceiros.</p>
     <p xml:lang="pt-BR">Extrator em linha de comando para dados de itinerários, para integração em aplicativos de terceiros.</p>
     <p xml:lang="sk">Extraktor cez príkazový riadok pre dáta itinerára na integráciu do aplikácií tretích strán.</p>
     <p xml:lang="sv">Extrahering av reseinformation på kommandoraden, för att integrera med tredjepartsprogram.</p>
     <p xml:lang="uk">Програма, керування якою відбувається з командного рядка, для видобування даних бронювання. Призначено для інтеграції зі сторонніми програмами.</p>
     <p xml:lang="x-test">xxCommand line extractor for itinerary data, for integrating into 3rd party applications.xx</p>
   </description>
   <url type="homepage">https://community.kde.org/KDE_PIM/KItinerary</url>
   <url type="bugtracker">https://bugs.kde.org/enter_bug.cgi?format=guided&amp;product=KDE+Itinerary</url>
   <project_group>KDE</project_group>
   <provides>
     <binary>kitinerary-extractor</binary>
   </provides>
   <releases>
+    <release version="5.13.1" date="2020-01-09"/>
     <release version="5.13.0" date="2019-12-12"/>
   </releases>
 </component>
diff --git a/src/extractors/nh-hotels.js b/src/extractors/nh-hotels.js
index 20809b1..7e51fdc 100644
--- a/src/extractors/nh-hotels.js
+++ b/src/extractors/nh-hotels.js
@@ -1,72 +1,72 @@
 /*
    Copyright (c) 2019 Volker Krause <vkrause@kde.org>
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU Library General Public License as published by
    the Free Software Foundation; either version 2 of the License, or (at your
    option) any later version.
 
    This library is distributed in the hope that it will be useful, but WITHOUT
    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
    License for more details.
 
    You should have received a copy of the GNU Library General Public License
    along with this library; see the file COPYING.LIB.  If not, write to the
    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 */
 
 function lastChild(elem) {
     var child = elem.firstChild;
     while (!child.nextSibling.isNull) {
         child = child.nextSibling;
     }
     return child;
 }
 
 function parseHtml(doc) {
 
     var res = JsonLd.newObject("LodgingReservation");
     res.reservationFor = JsonLd.newObject("LodgingBusiness");
 
     var nameElem = doc.eval("//td[@class=\"title-hotel\"]")[0];
     res.reservationFor.name = nameElem.content;
 
     var addrElem = nameElem.parent.nextSibling.nextSibling.nextSibling.firstChild;
-    var addr = addrElem.content.match(/([^,]*), (.*)/);
+    var addr = addrElem.content.match(/(.*), ?([^,]*)/);
     res.reservationFor.address = JsonLd.newObject("PostalAddress");
     res.reservationFor.address.streetAddress = addr[1];
     res.reservationFor.address.addressLocality = addr[2];
     res.reservationFor.url = lastChild(addrElem).attribute("href");
 
     var linkRoot = addrElem.parent.nextSibling.nextSibling;
     var links = linkRoot.eval(".//a");
     for (var i = 0; i < links.length; ++i) {
         var url = links[i].attribute("href");
         if (url.startsWith("tel:"))
             res.reservationFor.telephone = url.substr(4);
         else if (url.startsWith("mailto:"))
             res.reservationFor.email = url.substr(7);
     }
 
     var bookingRef = doc.eval("//table//tr/td/table//tr/td[2]")[0];
     res.reservationNumber = bookingRef.content;
     var bookingRow = bookingRef.parent.nextSibling.nextSibling;
 
     res.underName = JsonLd.newObject("Person");
     res.underName.name = bookingRow.firstChild.nextSibling.content;
     bookingRow = bookingRow.nextSibling.nextSibling;
 
     res.underName.email = bookingRow.firstChild.nextSibling.recursiveContent;
     bookingRow = bookingRow.nextSibling.nextSibling.nextSibling;
 
     var dt = bookingRow.firstChild.nextSibling.content.match(/([\d/]+).*?([\d:]+)/);
     res.checkinTime = JsonLd.toDateTime(dt[1] + dt[2], "dd/MM/yyyyhh:mm", "en");
     bookingRow = bookingRow.nextSibling.nextSibling;
 
     dt = bookingRow.firstChild.nextSibling.content.match(/([\d/]+).*?([\d:]+)/);
     res.checkoutTime = JsonLd.toDateTime(dt[1] + dt[2], "dd/MM/yyyyhh:mm", "en");
 
     return res;
 }