Refactoring
NearSphere query
Working count test