fix at least the popup w/CCH taxation on 3.0, RT#21485