Fix + testing sample filter + pom updates