Cleaning pom and better search