Fix diacritics & DbQuery bug