Fix for searching wide-area domains (and improve 252b88b)