Clean up package find Make facets kick ass Fix popular sort order Favourites and Facets support Use new find api