Fix 'by-auto' search