Fix solo search for 10.x