Adding back the listener filters: SOAP-2708