Tidy up needs search list and facets