diff --git a/prepare.sh b/prepare.sh
index 8bab702e32aca0f6bdc0e39c463a550db68f90f5..569e55ea8ef455f7de45642f3ba0e01f6604f1de 100755
--- a/prepare.sh
+++ b/prepare.sh
@@ -4,21 +4,23 @@ BASE_URL=$1
 TARGET_CHANNEL=$2
 SITE_PATH=$3
 RELEASE_BASE_PATH=$4
-#$BASE_URL="https://top.etsi.org/top-extras/updatesite"
 
 update_contents() {
     local TARGET_PATH=$1
     # Escape slashes in the variable
-    CLEAN=$(echo "$TARGET_PATH" | sed 's/\//\\\//g')
+    echo $TARGET_PATH
+    CLEAN=$(echo "$TARGET_PATH/" | sed 's/\//\\\//g')
+    echo $CLEAN
     # Use the escaped variable in a sed command
-    find . -type f | sed -e "s|$CLEAN_URL||g" > "$TARGET_PATH/content.txt"
+    echo "find . -type f | sed -e \"s|$CLEAN||g\" > \"$TARGET_PATH/content.txt\""
+    find $TARGET_PATH -type f | sed -e "s|$CLEAN||g" > "$TARGET_PATH/content.txt"
 }
 
 process_contents() {
     local base="content"
     local channel=$1
     local file="$base-$channel.txt"
-    curl "$BASE_URL/$channel/$base.txt" -o "$file"  
+    curl "$BASE_URL/$channel/$base.txt" -o "$file"
     mkdir $channel
 
     # Fetch files from page
@@ -26,6 +28,10 @@ process_contents() {
     while IFS= read -r line; do
         # Execute your command for each line
         echo "Processing: $line"
+        if [ "$line" == "" ]; then
+            echo "Empty line, aborting."
+            exit 0
+        fi        
         # make parent dirs
         mkdir -p `dirname "$line"`
         # get file
@@ -33,16 +39,25 @@ process_contents() {
         # update contents
     done < "$file"
     update_contents $channel
+    mkdir -p $RELEASE_BASE_PATH/$channel
     cp -r -f $channel/* $RELEASE_BASE_PATH/$channel
 }
 
 # process opposite channel
-if [ "$TARGET_CHANNEL" == "beta"]; then
+if [ "$TARGET_CHANNEL" == "beta" ]; then
     process_contents "main"
 else
     process_contents "beta"
 fi
 
-# update conteints
+# update contents
 update_contents "$SITE_PATH"
 
+# Debugging
+# BASE_URL="https://top.etsi.org/top-extras/updatesite"
+# TARGET_CHANNEL="beta"
+# SITE_PATH="updatesite/org.etsi.mts.tdl.extras.updatesite/target/repository"
+# RELEASE_BASE_PATH="public/updatesite"
+
+# # process_contents beta
+# update_contents "$SITE_PATH"