Restructured Shop-entity to add latitude/longitude, easier to sort for location aware sort.