More changes to get search working in API v1.1.