fix catalog, fix search