Fixes for domain language selection