Fix tagging without all fields