diff --git a/docker/tap-schema/1005_sdss_tap_schema.sql b/docker/tap-schema/1005_sdss_tap_schema.sql
index ed624b8..6d342e8 100644
--- a/docker/tap-schema/1005_sdss_tap_schema.sql
+++ b/docker/tap-schema/1005_sdss_tap_schema.sql
@@ -10,8 +10,8 @@ INSERT INTO tap_schema.columns11 (table_name, column_name, datatype, arraysize,
 INSERT INTO tap_schema.columns11 (table_name, column_name, datatype, arraysize, xtype, description, utype, unit, ucd, indexed, principal, std, column_index) VALUES ('sdss_stripe82_01.DeepCoadd', 'patch', 'char', 16, null, 'Sky-patch.', null, null, null, 0, 0, 0, null);
 INSERT INTO tap_schema.columns11 (table_name, column_name, datatype, arraysize, xtype, description, utype, unit, ucd, indexed, principal, std, column_index) VALUES ('sdss_stripe82_01.DeepCoadd', 'filterId', 'unsignedByte', null, null, 'Id of the filter for the band.', null, null, 'meta.id;instr.filter', 0, 0, 0, null);
 INSERT INTO tap_schema.columns11 (table_name, column_name, datatype, arraysize, xtype, description, utype, unit, ucd, indexed, principal, std, column_index) VALUES ('sdss_stripe82_01.DeepCoadd', 'filterName', 'char', 3, null, 'Filter name, pulled in from the Filter table.', null, null, 'instr.bandpass', 0, 0, 0, null);
-INSERT INTO tap_schema.columns11 (table_name, column_name, datatype, arraysize, xtype, description, utype, unit, ucd, indexed, principal, std, column_index) VALUES ('sdss_stripe82_01.DeepCoadd', 'ra', 'double', null, null, 'ICRS R.A. of image center, corresponding to FITS pixel coordinates ((NAXIS1 + 1)/2, (NAXIS2 + 1)/2).', null, 'deg', 'pos.eq.ra', 0, 0, 0, null);
-INSERT INTO tap_schema.columns11 (table_name, column_name, datatype, arraysize, xtype, description, utype, unit, ucd, indexed, principal, std, column_index) VALUES ('sdss_stripe82_01.DeepCoadd', 'decl', 'double', null, null, 'ICRS Dec. of image center, corresponding to FITS pixel coordinates ((NAXIS1 + 1)/2, (NAXIS2 + 1)/2).', null, 'deg', 'pos.eq.dec', 0, 0, 0, null);
+INSERT INTO tap_schema.columns11 (table_name, column_name, datatype, arraysize, xtype, description, utype, unit, ucd, indexed, principal, std, column_index) VALUES ('sdss_stripe82_01.DeepCoadd', 'ra', 'double', null, null, 'ICRS R.A. of image center, corresponding to FITS pixel coordinates ((NAXIS1 + 1)/2, (NAXIS2 + 1)/2).', null, 'deg', 'pos.eq.ra;meta.main', 0, 0, 0, null);
+INSERT INTO tap_schema.columns11 (table_name, column_name, datatype, arraysize, xtype, description, utype, unit, ucd, indexed, principal, std, column_index) VALUES ('sdss_stripe82_01.DeepCoadd', 'decl', 'double', null, null, 'ICRS Dec. of image center, corresponding to FITS pixel coordinates ((NAXIS1 + 1)/2, (NAXIS2 + 1)/2).', null, 'deg', 'pos.eq.dec;meta.main', 0, 0, 0, null);
 INSERT INTO tap_schema.columns11 (table_name, column_name, datatype, arraysize, xtype, description, utype, unit, ucd, indexed, principal, std, column_index) VALUES ('sdss_stripe82_01.DeepCoadd', 'htmId20', 'long', null, null, 'Level 20 HTM ID of (ra, decl)', null, null, 'pos.HTM', 0, 0, 0, null);
 INSERT INTO tap_schema.columns11 (table_name, column_name, datatype, arraysize, xtype, description, utype, unit, ucd, indexed, principal, std, column_index) VALUES ('sdss_stripe82_01.DeepCoadd', 'equinox', 'float', null, null, null, null, null, 'pos.equinox', 0, 0, 0, null);
 INSERT INTO tap_schema.columns11 (table_name, column_name, datatype, arraysize, xtype, description, utype, unit, ucd, indexed, principal, std, column_index) VALUES ('sdss_stripe82_01.DeepCoadd', 'raDeSys', 'char', 20, null, null, null, null, 'pos.frame', 0, 0, 0, null);
@@ -294,7 +294,7 @@ INSERT INTO tap_schema.columns11 (table_name, column_name, datatype, arraysize,
 INSERT INTO tap_schema.columns11 (table_name, column_name, datatype, arraysize, xtype, description, utype, unit, ucd, indexed, principal, std, column_index) VALUES ('sdss_stripe82_01.RunDeepSource', 'detect_is_patch_inner', 'boolean', null, null, 'Detection is in the non-overlapping region of the patch.', null, null, 'meta.code', 0, 0, 0, null);
 INSERT INTO tap_schema.columns11 (table_name, column_name, datatype, arraysize, xtype, description, utype, unit, ucd, indexed, principal, std, column_index) VALUES ('sdss_stripe82_01.RunDeepSource', 'detect_is_tract_inner', 'boolean', null, null, 'Detection is in the non-overlapping region of the tract.', null, null, 'meta.code', 0, 0, 0, null);
 INSERT INTO tap_schema.columns11 (table_name, column_name, datatype, arraysize, xtype, description, utype, unit, ucd, indexed, principal, std, column_index) VALUES ('sdss_stripe82_01.RunDeepSource', 'detect_is_primary', 'boolean', null, null, 'Detection is the primary of a set of overlapping detections.', null, null, 'meta.code', 0, 0, 0, null);
-INSERT INTO tap_schema.columns11 (table_name, column_name, datatype, arraysize, xtype, description, utype, unit, ucd, indexed, principal, std, column_index) VALUES ('sdss_stripe82_01.RunDeepSource', 'coord_raVar', 'float', null, null, 'Variance of ra due to centroid uncertainty (xVar, xyCov, yVar).', null, null, 'stat.variance;pos.eq', 0, 0, 0, null);
+INSERT INTO tap_schema.columns11 (table_name, column_name, datatype, arraysize, xtype, description, utype, unit, ucd, indexed, principal, std, column_index) VALUES ('sdss_stripe82_01.RunDeepSource', 'coord_raVar', 'float', null, null, 'Variance of ra due to centroid uncertainty (xVar, xyCov, yVar).', null, null, 'stat.variance;pos.eq.ra', 0, 0, 0, null);
 INSERT INTO tap_schema.columns11 (table_name, column_name, datatype, arraysize, xtype, description, utype, unit, ucd, indexed, principal, std, column_index) VALUES ('sdss_stripe82_01.RunDeepSource', 'coord_radeclCov', 'float', null, null, 'Covariance of ra, decl due to centroid uncertainty (xVar, xyCov, yVar).', null, null, 'stat.covariance;pos.eq', 0, 0, 0, null);
 INSERT INTO tap_schema.columns11 (table_name, column_name, datatype, arraysize, xtype, description, utype, unit, ucd, indexed, principal, std, column_index) VALUES ('sdss_stripe82_01.RunDeepSource', 'coord_declVar', 'float', null, null, 'Variance of decl due to centroid uncertainty (xVar, xyCov, yVar).', null, null, 'stat.variance;pos.eq.dec', 0, 0, 0, null);
 INSERT INTO tap_schema.columns11 (table_name, column_name, datatype, arraysize, xtype, description, utype, unit, ucd, indexed, principal, std, column_index) VALUES ('sdss_stripe82_01.RunDeepSource', 'coadd_id', 'long', null, null, 'ID of the coadd the source was detected and measured on (pointer to DeepCoadd).', null, null, 'meta.id;obs.image', 0, 0, 0, null);
@@ -306,8 +306,8 @@ INSERT INTO tap_schema.columns11 (table_name, column_name, datatype, arraysize,
 INSERT INTO tap_schema.columns11 (table_name, column_name, datatype, arraysize, xtype, description, utype, unit, ucd, indexed, principal, std, column_index) VALUES ('sdss_stripe82_01.Science_Ccd_Exposure', 'filterId', 'unsignedByte', null, null, 'Id of the filter for the band.', null, null, 'meta.id;instr.filter', 0, 0, 0, null);
 INSERT INTO tap_schema.columns11 (table_name, column_name, datatype, arraysize, xtype, description, utype, unit, ucd, indexed, principal, std, column_index) VALUES ('sdss_stripe82_01.Science_Ccd_Exposure', 'field', 'int', null, null, 'Field number.', null, null, null, 0, 0, 0, null);
 INSERT INTO tap_schema.columns11 (table_name, column_name, datatype, arraysize, xtype, description, utype, unit, ucd, indexed, principal, std, column_index) VALUES ('sdss_stripe82_01.Science_Ccd_Exposure', 'filterName', 'char', 3, null, 'Filter name, pulled in from the Filter table.', null, null, 'instr.bandpass', 0, 0, 0, null);
-INSERT INTO tap_schema.columns11 (table_name, column_name, datatype, arraysize, xtype, description, utype, unit, ucd, indexed, principal, std, column_index) VALUES ('sdss_stripe82_01.Science_Ccd_Exposure', 'ra', 'double', null, null, 'ICRS R.A. of image center, corresponding to FITS pixel coordinates ((NAXIS1 + 1)/2, (NAXIS2 + 1)/2).', null, 'deg', 'pos.eq.ra', 0, 0, 0, null);
-INSERT INTO tap_schema.columns11 (table_name, column_name, datatype, arraysize, xtype, description, utype, unit, ucd, indexed, principal, std, column_index) VALUES ('sdss_stripe82_01.Science_Ccd_Exposure', 'decl', 'double', null, null, 'ICRS Dec. of image center, corresponding to FITS pixel coordinates ((NAXIS1 + 1)/2, (NAXIS2 + 1)/2).', null, 'deg', 'pos.eq.dec', 0, 0, 0, null);
+INSERT INTO tap_schema.columns11 (table_name, column_name, datatype, arraysize, xtype, description, utype, unit, ucd, indexed, principal, std, column_index) VALUES ('sdss_stripe82_01.Science_Ccd_Exposure', 'ra', 'double', null, null, 'ICRS R.A. of image center, corresponding to FITS pixel coordinates ((NAXIS1 + 1)/2, (NAXIS2 + 1)/2).', null, 'deg', 'pos.eq.ra;meta.main', 0, 0, 0, null);
+INSERT INTO tap_schema.columns11 (table_name, column_name, datatype, arraysize, xtype, description, utype, unit, ucd, indexed, principal, std, column_index) VALUES ('sdss_stripe82_01.Science_Ccd_Exposure', 'decl', 'double', null, null, 'ICRS Dec. of image center, corresponding to FITS pixel coordinates ((NAXIS1 + 1)/2, (NAXIS2 + 1)/2).', null, 'deg', 'pos.eq.dec;meta.main', 0, 0, 0, null);
 INSERT INTO tap_schema.columns11 (table_name, column_name, datatype, arraysize, xtype, description, utype, unit, ucd, indexed, principal, std, column_index) VALUES ('sdss_stripe82_01.Science_Ccd_Exposure', 'htmId20', 'long', null, null, 'Level 20 HTM ID of (ra, decl)', null, null, 'pos.HTM', 0, 0, 0, null);
 INSERT INTO tap_schema.columns11 (table_name, column_name, datatype, arraysize, xtype, description, utype, unit, ucd, indexed, principal, std, column_index) VALUES ('sdss_stripe82_01.Science_Ccd_Exposure', 'equinox', 'float', null, null, 'Equinox of coordinates', null, null, 'pos.equinox', 0, 0, 0, null);
 INSERT INTO tap_schema.columns11 (table_name, column_name, datatype, arraysize, xtype, description, utype, unit, ucd, indexed, principal, std, column_index) VALUES ('sdss_stripe82_01.Science_Ccd_Exposure', 'raDeSys', 'char', 20, null, 'Coordinate system for equinox', null, null, 'pos.frame', 0, 0, 0, null);