My Task filter fixes

@bmomberger-reciprocity, @pkanazir hopes to get these changes into the production release, if it's possible.