Start 21/10/2019 had play 8 match? New Player start 13/01/2020 need start 1 instead 8

Hi all,
in the file?
New Sign on player in highlight yellow
This formula I'm looking for from A sheet M23:AD23

As you see D4:D11 formula
IF(B$2="","",IFERROR(HLOOKUP($A4,A!$M$1:$AG$1,1,0),""))

G4:G11 formula
IF(D4="","",IFERROR(HLOOKUP(D4,A!$M$1:$AG$34,G$1,0),""))
Both formula work great from start of the season 21/10/2019 to finish?
But not if you sign up new player need start 13/01/2020 start count as 1 onward

Regard