More fixes to Select String.