Fix both explicit and implicit tags for submodel