More changes to get april tags working