diff --git a/tools/search_for_this_email_in_players.sh b/tools/search_for_this_email_in_players.sh
index be45c522..291a8bf9 100755
--- a/tools/search_for_this_email_in_players.sh
+++ b/tools/search_for_this_email_in_players.sh
@@ -19,16 +19,17 @@ EMAIL="$1"
 
 if [[ "${EMAIL}" =~ ^[a-zA-Z0-9.%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}$ ]]; then
 
-    INDEX=$(ls $HOME/.zen/game/players/${EMAIL}/ipfs/moa/index.html 2>/dev/null) ## LOCAL
-    [[ ! $INDEX ]] && INDEX=$(ls $HOME/.zen/tmp/${IPFSNODEID}/TW/${EMAIL}/index.html 2>/dev/null) ## CACHE
-    [[ ! $INDEX ]] && INDEX=$(ls $HOME/.zen/tmp/swarm/*/TW/${EMAIL}/index.html 2>/dev/null) ## SWARM
+    INDEX=$(ls $HOME/.zen/game/players/${EMAIL}/ipfs/moa/index.html 2>/dev/null) && source="LOCAL"
+    [[ ! $INDEX ]] && INDEX=$(ls $HOME/.zen/tmp/${IPFSNODEID}/TW/${EMAIL}/index.html 2>/dev/null) && source="CACHE"
+    [[ ! $INDEX ]] && INDEX=$(ls $HOME/.zen/tmp/swarm/*/TW/${EMAIL}/index.html 2>/dev/null) && source="SWARM"
     [[ ! $INDEX ]] && exit 1
     ## TODO ? SEARCH WITH DNSLINK
-    echo "export TW=${INDEX}"
+    echo "export TW=${INDEX} source=${source}"
 
     # SWARM CACHE index.html contains
-    # <meta http-equiv="refresh" content="0; url='/ipns/$EXTERNAL'" />
-    EXTERNAL=$(grep -o "url='/[^']*'" ${INDEX} | sed "s/url='\(.*\)'/\1/" | awk -F"/" '{print $3}')
+    # <meta http-equiv="refresh" content="0; url='/ipfs/$EXTERNAL'" />
+    [[ ${source} != "LOCAL" ]] \
+        && EXTERNAL=$(grep -o "url='/[^']*'" ${INDEX} | sed "s/url='\(.*\)'/\1/" | awk -F"/" '{print $3}')
 
     if [[ ! ${EXTERNAL} ]]; then
         ## EXTRACT DATA FROM TW
@@ -39,13 +40,15 @@ if [[ "${EMAIL}" =~ ^[a-zA-Z0-9.%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}$ ]]; then
 
         ASTROPORT=$(cat ~/.zen/tmp/${MOATS}/Astroport.json | jq -r .[].astroport)
         ASTROG1=$(cat ~/.zen/tmp/${MOATS}/Astroport.json | jq -r .[].g1pub)
+        TWCHAIN=$(cat ~/.zen/tmp/${MOATS}/Astroport.json | jq -r .[].chain)
 
         ## GET ASTRONAUTENS - field was missing in TW model Astroport Tiddler -
         ASTRONAUTENS=$(cat ~/.zen/tmp/${MOATS}/Astroport.json | jq -r .[].astronautens)
         [[ ${ASTRONAUTENS} == "null" || ${ASTRONAUTENS} == "" ]] && ASTRONAUTENS="/ipns/"$(ipfs key list -l | grep -w ${ASTROG1} | cut -d ' ' -f1)
         [[ ${ASTRONAUTENS} == "/ipns/" ]] && ASTRONAUTENS=""
     else
-        ASTRONAUTENS="/ipns/${EXTERNAL}"
+        ASTRONAUTENS="/ipfs/${EXTERNAL}"
+        ASTROPORT="/ipns/$(echo $INDEX | rev | cut -d / -f 4 | rev)"
     fi
 
     rm -Rf ~/.zen/tmp/${MOATS}