Clean up baselineSGP data-subsetting and baseline config construction with YEAR_WITHIN