Some refinement of Astrometry.net handler