scoped the where to location
Merge pull request #104 from LightningLord/bug-96

Bug 100 fixes
Merge branch 'master' into refactored_location_query
Merge pull request #105 from LightningLord/refactored_location_query

Refactored location query
Merge branch 'master' of https://github.com/LightningLord/errandsontheway into bug-96