Fix injection into tag handlers