Changed academic_id for queries