FIX: Searching was broken due to API changes.