improved mapping of shops