Added tags for Calendar features