store locator some tested issues
Revert "store locator some tested issues"

This reverts commit e79c7d5acba09c09f5641b83a32ee0795d76b7f1.
Revert "Revert "store locator some tested issues""

This reverts commit 5938125e7175386caba34524af2e0de2a188e4f3.