Hello Katie
Glad it helped. Your formulas would work except I think the one beginning in cell A4 on each sheet. Which was:

=IF($O4="","",INDEX('All Data'!A:A,O$4))
You were making the row at O4 absolute instead of the column, which should be:

=IF($O4="","",INDEX('All Data'!A:A,$O4))
Mine were just a little more succinct and referenced Table3 to make them perhaps a bit more effecient than referencing entire columns.

DBY