Resolving issue #398

Resolving issue #398 regarding wrong fallback-logic for locale when using QueryBuilder.