Images controller is updated to account for image nesting under races