Don't share current location until current location selected Issue #357