Polished search and POM