#5428 use stream_filter_remove as there was a hint about it in the code. Also added unit test