Reworked automatic targeting and alignment to not be dependent on last year's target formats