updated for version 7.4.485
Problem:    Abbreviations don't work. (Toothpik)
Solution:   Move the length computation inside the for loop.  Compare against
	    the unescaped key.
Added tag v7-4-485 for changeset 7844d92941fd