Fix + testing sample filter