Swap out 'section' for 'tag' in a couple more helpers