More option search improvements