Better field names for nested tags, some refactoring