More dumby-proofing of search results