Fixing PoC vs Helper filters