deal with languages better

@smn issue #41 created and issue [universalcore/unicore-cms#60](https://github.com/universalcore/unicore-cms/issues/60)