Improve and fix language lookups