Fixes 126 and 136 for PoC and Helper filters