be case-insensitive
fix missing data