Add quick search for #1868