Improve the planet selection