Misc

* added column bitIdx to ?_titles
 * actually don't use COLLATE as it ignores indizes. Just search with lowerCase and properCase simultaneously

includes/types/basetype.class.php

@@ -169,9 +169,6 @@ abstract class BaseType
                 }
                 else if (is_string($c[1]))
                 {
-                    if (!empty($miscData['forceCiCollate']))
-                        $field .= ' COLLATE utf8_general_ci';
-
                     $op  = (isset($c[2]) && $c[2] == '!') ? 'NOT LIKE' : 'LIKE';
                     $val = DB::Aowow()->escape($c[1]);
                 }
@@ -1031,10 +1028,10 @@ abstract class Filter
 
     private function genericString($field, $value, $localized)
     {
-        if (!$localized)
-            return [$field, (string)$value];
+        if ($localized)
+            $field .= '_loc'.User::$localeId;
 
-        return $this->modularizeString([$field.'_loc'.User::$localeId], $value);
+        return $this->modularizeString([$field], (string)$value);
     }
 
     private function genericNumeric($field, &$value, $op, $castInt)

includes/types/creature.class.php

@@ -76,7 +76,8 @@ class CreatureList extends BaseType
         if ($type)
             $row3[] = Lang::game('ct', $type);
 
-        $row3[] = '('.Lang::npc('rank', $this->curTpl['rank']).')';
+        if ($_ = Lang::npc('rank', $this->curTpl['rank']))
+            $row3[] = '('.$_.')';
 
         $x  = '<table>';
         $x .= '<tr><td><b class="q">'.$this->getField('name', true).'</b></td></tr>';