diff --git a/app/models/ell.rb b/app/models/ell.rb
index ad291d72..018d5df7 100644
--- a/app/models/ell.rb
+++ b/app/models/ell.rb
@@ -9,7 +9,7 @@ class Ell < ApplicationRecord
 
     ell = ell.delete(",")
     case ell
-    in /lep\s*student\s*1st\s*year|LEP\s*student\s*not\s*1st\s*year|EL\s*Student\s*First\s*Year|LEP\s*student|^EL\s+|true|1/i
+    in /lep\s*student\s*1st\s*year|LEP\s*student\s*not\s*1st\s*year|EL\s*Student\s*First\s*Year|LEP\s*student|^EL\s+|true|1|^ELL$/i
       "ELL"
     in /0|2|3|Does\s*not\s*apply/i
       "Not ELL"
diff --git a/app/models/income.rb b/app/models/income.rb
index 3c069ea6..45f9be8d 100644
--- a/app/models/income.rb
+++ b/app/models/income.rb
@@ -10,9 +10,9 @@ class Income < ApplicationRecord
     return "Economically Disadvantaged - N" if income.blank? or income.nil?
 
     case income
-    in /Free\s*Lunch|Reduced\s*Lunch|Low\s*Income|Reduced\s*price\s*lunch|true|1/i
+    in /Free\s*Lunch|Reduced\s*Lunch|Low\s*Income|Reduced\s*price\s*lunch|true|1|^Yes$/i
       "Economically Disadvantaged - Y"
-    in /Not\s*Eligible|false|0/i
+    in /Not\s*Eligible|false|0|^No$/i
       "Economically Disadvantaged - N"
     in %r{^#*N/*A$|Unknown|Income}i
       "Unknown"
diff --git a/app/models/sped.rb b/app/models/sped.rb
index 057aa1ba..01fe0bfa 100644
--- a/app/models/sped.rb
+++ b/app/models/sped.rb
@@ -10,7 +10,7 @@ class Sped < ApplicationRecord
     case sped
     in /active|^A$|1|^Special\s*Education$/i
       "Special Education"
-    in /^I$|exited|0|^Not\s*Special\s*Education$|Does\s*not\s*apply|Referred|Ineligible/i
+    in /^I$|exited|0|^Not\s*Special\s*Education$|Does\s*not\s*apply|Referred|Ineligible|^No\s*special\s*needs$/i
       "Not Special Education"
     in %r{^#*N/*A$|Unknown|SpecialEdStatus|SPED}i
       "Unknown"
diff --git a/spec/fixtures/demographic_glossary.csv b/spec/fixtures/demographic_glossary.csv
index f9e3f935..4ff277d8 100644
--- a/spec/fixtures/demographic_glossary.csv
+++ b/spec/fixtures/demographic_glossary.csv
@@ -4,8 +4,8 @@ EL student not 1st year,ELL,EL Student First Year,A,Special Education,Special Ed
 EL student 1st year,ELL,ELL- SIS,1,Special Education,SPED- SIS,LowIncome,Economically Disadvantaged – Y,SES- SIS
 "EL student, 1st year",ELL,DirectCert,Special Education,Special Education,SPED,Low Income,Economically Disadvantaged – Y,EconDisadvantaged
 EL - Early Child. or PK,ELL,ELL,Referred,Not Special Education,,Reduced price lunch,Economically Disadvantaged – Y,Income SIS
-1,ELL,,Ineligible,Not Special Education,,TRUE,Economically Disadvantaged – Y,SES 
-lep student 1st year,ELL,,I,Not Special Education,,1,Economically Disadvantaged – Y,
+1,ELL,English Learner,Ineligible,Not Special Education,,TRUE,Economically Disadvantaged – Y,SES 
+lep student 1st year,ELL,,I,Not Special Education,,1,Economically Disadvantaged – Y,DirectCert
 lep student not 1st year,ELL,,exited,Not Special Education,,Not Eligible,Economically Disadvantaged – N,
 LEP Not1stYr,ELL,,0,Not Special Education,,FALSE,Economically Disadvantaged – N,
 LEP1stYr US Sch,ELL,,Not Special Education,Not Special Education,,0,Economically Disadvantaged – N,
@@ -15,7 +15,7 @@ Does not apply,Not ELL,,Does not apply,Not Special Education,,[blanks],Economica
 3,Not ELL,,NA,Unknown,,N/A,Unknown,
 [blanks],Not ELL,,N/A,Unknown,,#N/A,Unknown,
 #NA,Unknown,,#N/A,Unknown,,Income,Unknown,
-NA,Unknown,,SPED,Unknown,,,,
-N/A,Unknown,,,,,,,
+NA,Unknown,,SPED,Unknown,,Yes,Economically Disadvantaged – Y,
+N/A,Unknown,,No special needs,Not Special Education,,No,Economically Disadvantaged – N,
 #N/A,Unknown,,,,,,,
 ELL,ELL,,,,,,,