Search result fixes