Issue #392 revert old version of language selection, partial resolve