Resolve mapping correctly for template changed in WP