fixed empty model strings and line 1127, 1489 superfluous singe-quote