Case 2882 - Cleanup and additions.
Case 2882 - Fixed Scan,Spell, entities.
Merge branch 'case-2882' into new-search

* case-2882:
  Case 2882 - Fixed Scan,Spell, entities.
  Case 2882 - Cleanup and additions.

Conflicts:
	ting.entities.inc