Added check to avoid EB/EE migration in matching choice