Reworking catalog search.