Since we moved from hashes to objects I have to update the search