Performance improvement on count location data.

Conflicts:
	FS/FS/Schema.pm