Minor search improvements