Factor create_client_specific_tag() out of add_tag_for_client()