FIX: More individual search results analysis fixes