more if statement issues

a bug where the function that was traversing the tokens wasnt returning
a tag from the correct tier was messing up nested if statements.