Fix calls for tag handling