More wavelet filtering tweaks