Standards-conformant version of recent search result changes.