You discovered the typo. Yes, agency_id should not be in every if statement. That was a copy/paste error when I was writing the code. So rewriting it the way you did would not be right.