Remove the vestigial remains of the admin catchall that never made it into carto.
Use admin polygons for labels, and offset them from the edges towards the interior.