diff --git a/CMakeLists.txt b/CMakeLists.txt
index 76770cf..b5ae29d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,132 +1,132 @@
 cmake_minimum_required(VERSION 3.5)
 set(PIM_VERSION "5.14.2")
 project(KItinerary VERSION ${PIM_VERSION})
 
 set(CMAKE_CXX_STANDARD 14)
 set(KF5_MIN_VERSION "5.68.0")
 
 find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE)
 set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake)
 
 include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
 include(ECMAddTests)
 include(ECMGenerateHeaders)
 include(ECMQtDeclareLoggingCategory)
 include(ECMSetupVersion)
 include(FeatureSummary)
 include(KDEInstallDirs)
 include(KDECMakeSettings)
 include(GenerateExportHeader)
 
 ecm_setup_version(PROJECT VARIABLE_PREFIX KITINERARY
     VERSION_HEADER kitinerary_version.h
     PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KPimItineraryConfigVersion.cmake"
 )
 
 set(QT_REQUIRED_VERSION "5.12.0")
 
 
 find_package(Qt5 ${QT_REQUIRED_VERSION} REQUIRED COMPONENTS Gui Qml)
 find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS I18n)
 if (NOT ANDROID)
     find_package(SharedMimeInfo 1.3 REQUIRED)
 endif()
 
 set(KMIME_VERSION "5.14.2")
 set(PIM_PKPASS "5.14.2")
 
 find_package(KF5Mime ${KMIME_VERSION} CONFIG REQUIRED)
 find_package(KF5CalendarCore ${KF5_MIN_VERSION} CONFIG)
 find_package(KF5Contacts ${KF5_MIN_VERSION} CONFIG REQUIRED)
 find_package(KPimPkPass ${PIM_PKPASS} CONFIG REQUIRED)
 find_package(Poppler COMPONENTS Core)
 set_package_properties("Poppler" PROPERTIES TYPE OPTIONAL PURPOSE "Support for extraction from PDF booking confirmations.")
 find_package(ZXing CONFIG)
 set_package_properties("ZXing" PROPERTIES TYPE OPTIONAL PURPOSE "Support for barcode decoding." URL "https://github.com/nu-book/zxing-cpp")
 find_package(ZLIB REQUIRED)
 set_package_properties("ZLIB" PROPERTIES PURPOSE "Support for decoding UIC 918-3 train tickets.")
 find_package(LibXml2 MODULE)
 set_package_properties("LibXml2" PROPERTIES PURPOSE "Support for extraction from HTML booking confirmations." URL "http://libxml.org")
 find_package(PhoneNumber OPTIONAL_COMPONENTS PhoneNumber QUIET)
 set_package_properties("PhoneNumber" PROPERTIES PURPOSE "Parsing and geo-coding of phone numbers.")
 find_package(OpenSSL 1.1)
 set_package_properties("OpenSSL" PROPERTIES TYPE OPTIONAL PURPOSE "VDV ticket decoding." URL "https://openssl.org")
 
 if (NOT ANDROID)
     set_package_properties(KF5CalendarCore PROPERTIES TYPE REQUIRED)
     set_package_properties(LibXml2 PROPERTIES TYPE REQUIRED)
 endif()
 
 if(TARGET Poppler::Core)
     # check if we have private Poppler headers
     find_file(HAVE_POPPLER_UNSTABLE_HEADERS "OutputDev.h" PATHS ${Poppler_INCLUDE_DIRS} NO_DEFAULT_PATH)
     if (NOT HAVE_POPPLER_UNSTABLE_HEADERS)
         message(WARNING "Poppler was not build with ENABLE_UNSTABLE_API_ABI_HEADER - building without PDF support!")
         set(HAVE_POPPLER FALSE)
     else()
         set(HAVE_POPPLER TRUE)
     endif()
 endif()
 if (HAVE_POPPLER)
     string(REPLACE "." ";" _poppler_version_components ${Poppler_VERSION})
     list(GET _poppler_version_components 0 POPPLER_VERSION_MAJOR)
     list(GET _poppler_version_components 1 POPPLER_VERSION_MINOR)
     list(GET _poppler_version_components 2 POPPLER_VERSION_PATCH)
 endif()
 
-if (TARGET ZXing::Core)
+if (TARGET ZXing::ZXing OR TARGET ZXing::Core)
     set(HAVE_ZXING ON)
 endif()
 
 if (TARGET KF5::CalendarCore)
     set(HAVE_KCAL ON)
 endif()
 if (LIBXML2_FOUND)
     set(HAVE_LIBXML2 ON)
 endif()
 if (TARGET PhoneNumber::PhoneNumber)
     set(HAVE_PHONENUMBER ON)
 endif()
 if (TARGET OpenSSL::Crypto)
     set(HAVE_OPENSSL_RSA ON)
 endif()
 
 add_definitions(-DTRANSLATION_DOMAIN=\"kitinerary\")
 
 if (EXISTS "${CMAKE_SOURCE_DIR}/.git")
    add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050e00)
    add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x054400)
 endif()
 
 add_definitions(-DQT_NO_FOREACH)
 
 set(CMAKECONFIG_INSTALL_DIR "${CMAKECONFIG_INSTALL_PREFIX}/KPimItinerary")
 set(KDE_INSTALL_INCLUDEDIR_PIM ${KDE_INSTALL_INCLUDEDIR}/KPim)
 
 add_subdirectory(src)
 if(BUILD_TESTING)
    add_subdirectory(autotests)
 endif()
 feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)
 
 configure_package_config_file(
     "${CMAKE_CURRENT_SOURCE_DIR}/KPimItineraryConfig.cmake.in"
     "${CMAKE_CURRENT_BINARY_DIR}/KPimItineraryConfig.cmake"
     INSTALL_DESTINATION "${CMAKECONFIG_INSTALL_DIR}"
 )
 
 install(FILES
         "${CMAKE_CURRENT_BINARY_DIR}/KPimItineraryConfig.cmake"
         "${CMAKE_CURRENT_BINARY_DIR}/KPimItineraryConfigVersion.cmake"
         DESTINATION "${CMAKECONFIG_INSTALL_DIR}"
         COMPONENT Devel)
 
 install(EXPORT KPimItineraryTargets
         DESTINATION "${CMAKECONFIG_INSTALL_DIR}"
         FILE KPimItineraryTargets.cmake
         NAMESPACE KPim::
 )
 install(FILES org_kde_kitinerary.categories  DESTINATION  ${KDE_INSTALL_LOGGINGCATEGORIESDIR})
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kitinerary_version.h
         DESTINATION ${KDE_INSTALL_INCLUDEDIR_PIM} COMPONENT Devel)
 ki18n_install(po)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 8429468..e900a4b 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,248 +1,250 @@
 add_subdirectory(cli)
 if (TARGET Qt5::Network)
     add_subdirectory(knowledgedb-generator)
 endif()
 add_subdirectory(vdv/certs)
 configure_file(config-kitinerary.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kitinerary.h)
 
 set(kitinerary_lib_srcs
     datatypes/action.cpp
     datatypes/brand.cpp
     datatypes/bustrip.cpp
     datatypes/creativework.cpp
     datatypes/event.cpp
     datatypes/flight.cpp
     datatypes/organization.cpp
     datatypes/person.cpp
     datatypes/place.cpp
     datatypes/reservation.cpp
     datatypes/taxi.cpp
     datatypes/ticket.cpp
     datatypes/traintrip.cpp
     datatypes/rentalcar.cpp
     datatypes/visit.cpp
 
     generic/genericextractor.cpp
     generic/genericicalextractor.cpp
     generic/genericpdfextractor.cpp
     generic/genericpkpassextractor.cpp
     generic/genericuic918extractor.cpp
     generic/genericvdvextractor.cpp
     generic/structureddataextractor.cpp
 
     jsapi/barcode.cpp
     jsapi/bitarray.cpp
     jsapi/context.cpp
     jsapi/jsonld.cpp
 
     knowledgedb/alphaid.cpp
     knowledgedb/airportdb.cpp
     knowledgedb/countrydb.cpp
     knowledgedb/iatacode.cpp
     knowledgedb/knowledgedb.cpp
     knowledgedb/timezonedb.cpp
     knowledgedb/trainstationdb.cpp
 
     pdf/pdfdocument.cpp
     pdf/pdfextractoroutputdevice.cpp
     pdf/pdfimage.cpp
     pdf/pdfvectorpicture.cpp
     pdf/popplerglobalparams.cpp
     pdf/popplerutils.cpp
 
     tlv/berelement.cpp
 
     uic9183/rct2ticket.cpp
     uic9183/uic9183block.cpp
     uic9183/uic9183parser.cpp
     uic9183/uic9183ticketlayout.cpp
     uic9183/vendor0080block.cpp
 
     vdv/iso9796_2decoder.cpp
     vdv/vdvcertificate.cpp
     vdv/vdvticket.cpp
     vdv/vdvticketparser.cpp
     vdv/certs/vdv-certs.qrc
 
     barcodedecoder.cpp
     calendarhandler.cpp
     documentutil.cpp
     extractor.cpp
     extractorcapabilities.cpp
     extractorengine.cpp
     extractorfilter.cpp
     extractorinput.cpp
     extractorpostprocessor.cpp
     extractorrepository.cpp
     extractorutil.cpp
     extractorvalidator.cpp
     file.cpp
     flightpostprocessor.cpp
     htmldocument.cpp
     iatabcbpparser.cpp
     jsonlddocument.cpp
     jsonldimportfilter.cpp
     locationutil.cpp
     mergeutil.cpp
     qimagepurebinarizer.cpp
     sortutil.cpp
     stringutil.cpp
 )
 qt5_add_resources(kitinerary_lib_srcs extractors/extractors.qrc)
 ecm_qt_declare_logging_category(kitinerary_lib_srcs HEADER logging.h IDENTIFIER KItinerary::Log CATEGORY_NAME org.kde.kitinerary)
 ecm_qt_declare_logging_category(kitinerary_lib_srcs HEADER compare-logging.h IDENTIFIER KItinerary::CompareLog CATEGORY_NAME org.kde.kitinerary.comparator)
 ecm_qt_declare_logging_category(kitinerary_lib_srcs HEADER validator-logging.h IDENTIFIER KItinerary::ValidatorLog CATEGORY_NAME org.kde.kitinerary.extractorValidator)
 
 add_library(KPimItinerary ${kitinerary_lib_srcs})
 add_library(KPim::Itinerary ALIAS KPimItinerary)
 generate_export_header(KPimItinerary BASE_NAME KItinerary)
 set_target_properties(KPimItinerary PROPERTIES
     VERSION ${KITINERARY_VERSION_STRING}
     SOVERSION ${KITINERARY_SOVERSION}
     EXPORT_NAME Itinerary
 )
 target_include_directories(KPimItinerary INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_PIM}>")
 target_include_directories(KPimItinerary PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>")
 target_include_directories(KPimItinerary PRIVATE ${CMAKE_BINARY_DIR})
 target_link_libraries(KPimItinerary
     PUBLIC
         Qt5::Core
         KF5::Mime
     PRIVATE
         Qt5::Qml
         KF5::Archive
         KF5::I18n
         KF5::Contacts
         KPim::PkPass
         ${ZLIB_LIBRARIES}
 )
 if (HAVE_POPPLER)
     target_link_libraries(KPimItinerary PRIVATE Poppler::Core)
 endif()
 
-if (HAVE_ZXING)
+if (TARGET ZXing::ZXing)
+    target_link_libraries(KPimItinerary PRIVATE ZXing::ZXing)
+elseif (TARGET ZXing::Core)
     target_link_libraries(KPimItinerary PRIVATE ZXing::Core)
 endif()
 
 if (HAVE_KCAL)
     target_link_libraries(KPimItinerary PUBLIC KF5::CalendarCore)
 endif()
 if (HAVE_LIBXML2)
     target_compile_definitions(KPimItinerary PRIVATE ${LIBXML2_DEFINITIONS})
     target_include_directories(KPimItinerary PRIVATE ${LIBXML2_INCLUDE_DIR})
     target_link_libraries(KPimItinerary PRIVATE ${LIBXML2_LIBRARIES})
 endif()
 if (HAVE_PHONENUMBER)
     target_link_libraries(KPimItinerary PRIVATE PhoneNumber::PhoneNumber)
 endif()
 if (HAVE_OPENSSL_RSA)
     target_link_libraries(KPimItinerary PRIVATE OpenSSL::Crypto)
 endif()
 
 ecm_generate_headers(KItinerary_FORWARDING_HEADERS
     HEADER_NAMES
         BarcodeDecoder
         CalendarHandler
         DocumentUtil
         Extractor
         ExtractorCapabilities
         ExtractorEngine
         ExtractorFilter
         ExtractorInput
         ExtractorPostprocessor
         ExtractorRepository
         File
         HtmlDocument
         IataBcbpParser
         JsonLdDocument
         LocationUtil
         MergeUtil
         SortUtil
     PREFIX KItinerary
     REQUIRED_HEADERS KItinerary_HEADERS
 )
 ecm_generate_headers(KItinerary_KnowledgeDb_FORWARDING_HEADERS
     HEADER_NAMES
         AlphaId
         CountryDb
         KnowledgeDb
     PREFIX KItinerary
     REQUIRED_HEADERS KItinerary_KnowledgeDb_HEADERS
     RELATIVE knowledgedb
 )
 ecm_generate_headers(KItinerary_Datatypes_FORWARDING_HEADERS
     HEADER_NAMES
         Action
         Brand
         BusTrip
         CreativeWork
         Datatypes
         Event
         Flight
         Organization
         Reservation
         RentalCar
         Person
         Place
         Taxi
         Ticket
         TrainTrip
         Visit
     PREFIX KItinerary
     REQUIRED_HEADERS KItinerary_Datatypes_HEADERS
     RELATIVE datatypes
 )
 ecm_generate_headers(KItinerary_Pdf_FORWARDING_HEADERS
     HEADER_NAMES
         PdfDocument
         PdfImage
     PREFIX KItinerary
     REQUIRED_HEADERS KItinerary_Pdf_HEADERS
     RELATIVE pdf
 )
 ecm_generate_headers(KItinerary_Uic9183_FORWARDING_HEADERS
     HEADER_NAMES
         Rct2Ticket
         Uic9183Block
         Uic9183Parser
         Uic9183TicketLayout
         Vendor0080Block
     PREFIX KItinerary
     REQUIRED_HEADERS KItinerary_Uic9183_HEADERS
     RELATIVE uic9183
 )
 
 ecm_generate_headers(KItinerary_Vdv_FORWARDING_HEADERS
     HEADER_NAMES
         VdvTicket
         VdvTicketParser
     PREFIX KItinerary
     REQUIRED_HEADERS KItinerary_Vdv_HEADERS
     RELATIVE vdv
 )
 
 install(TARGETS KPimItinerary EXPORT KPimItineraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS})
 install(FILES
     ${KItinerary_FORWARDING_HEADERS}
     ${KItinerary_KnowledgeDb_FORWARDING_HEADERS}
     ${KItinerary_Datatypes_FORWARDING_HEADERS}
     ${KItinerary_Pdf_FORWARDING_HEADERS}
     ${KItinerary_Uic9183_FORWARDING_HEADERS}
     ${KItinerary_Vdv_FORWARDING_HEADERS}
     DESTINATION ${KDE_INSTALL_INCLUDEDIR_PIM}/KItinerary
 )
 install(FILES
     ${KItinerary_HEADERS}
     ${KItinerary_AirportDb_HEADERS}
     ${KItinerary_Datatypes_HEADERS}
     ${KItinerary_KnowledgeDb_HEADERS}
     ${KItinerary_Pdf_HEADERS}
     ${KItinerary_Uic9183_HEADERS}
     ${KItinerary_Vdv_HEADERS}
     ${CMAKE_CURRENT_BINARY_DIR}/kitinerary_export.h
     DESTINATION ${KDE_INSTALL_INCLUDEDIR_PIM}/kitinerary
 )
 if (NOT ANDROID)
     install(FILES application-vnd-kde-itinerary.xml DESTINATION ${XDG_MIME_INSTALL_DIR})
     update_xdg_mimetypes(${XDG_MIME_INSTALL_DIR})
 endif()