ORION-447 Improving initial discovery