Working version of compat filtering