CATALOG: search + small fixes