REFS: #407 Search Polishings