Add tags into api out