First Order Survey Repair