merged #962 to circumvent cloudflare issues thanks @stratuma fix dub override #965 added error dialog #959 (comment), #961 and #963