Make tag delivery work when channel name differs from profile name

Solves #466

Tested and it works fine, but still not sure why we were testing for channel_name.