Additional updates to baselineSGP (and getPanelData) to work with YEAR_WITHIN