diff --git a/scripts/shell/images-indexer.sh b/scripts/shell/images-indexer.sh
index dbd4ab5..139b183 100755
--- a/scripts/shell/images-indexer.sh
+++ b/scripts/shell/images-indexer.sh
@@ -131,7 +131,7 @@ input_selected_folders_and_fill_selected_folders_variable() {
 
   selected_options=($(convert_csv_to_array "$selected_options_arg"))
 
-  if [ "$selected_option" == 'n' ]; then
+  if [ "$selected_options_arg" == 'n' ]; then
     new_folder_input_message="Please create a new folder"
 
     new_foldername=$(read_command $new_folder_input_message)
@@ -199,7 +199,7 @@ show_folder_selection_list_and_fill_selected_folder_variable() {
       printf "\n"
 
       input_selected_folders_and_fill_selected_folders_variable
-      while [ -z "$selected_folder" ]; do
+      while [ -z "$selected_folders" ]; do
         input_selected_folders_and_fill_selected_folders_variable
       done
     fi
@@ -409,6 +409,15 @@ generate_random_string_with_suffix() {
   echo $random_string
 }
 
+get_extension_from_filename() {
+  fullfile=$1
+
+  filename=$(basename -- "$fullfile")
+  extension="${filename##*.}"
+
+  echo $extension
+}
+
 image_download_steps() {
   url_to_download=$1
 
@@ -427,13 +436,10 @@ image_download_steps() {
     fi
   done
 
-  media_extension=$(get_information_from_gallery_dl_media "$url_to_download" "extension")
-  tmp_filename=$(generate_random_string_with_suffix "$media_extension")
-
   echo ""
   echo "Download starting..."
 
-  gallery-dl --quiet --directory ${tmp_dir} --filename ${tmp_filename} $url_to_download
+  downloaded_images=($(gallery-dl --directory ${tmp_dir} $url_to_download))
 
   if [[ $? -ne 0 ]]; then
     unsucessful_downloads+="$url_to_download"
@@ -442,21 +448,27 @@ image_download_steps() {
 
   echo "Download finished."
 
-  for folder in "${selected_folders[@]}"; do
-    cd "${furry_commission_ideas_path}/${folder}"
+  for downloaded_image_temp_path in "${downloaded_images[@]}"; do
+    if [ $downloaded_image_temp_path == '#' ]; then
+      continue
+    fi
 
-    final_temp_filepath="${tmp_dir}/${tmp_filename}"
+    for folder in "${selected_folders[@]}"; do
+      cd "${furry_commission_ideas_path}/${folder}"
 
-    final_temp_filepath_md5=($(md5sum $final_temp_filepath))
+      file_extension=$(get_extension_from_filename "$downloaded_image_temp_path")
 
-    final_filename="${final_temp_filepath_md5}.${media_extension}"
+      final_temp_filepath_md5=($(md5sum $downloaded_image_temp_path))
 
-    cp $final_temp_filepath ./${final_filename}
+      final_filename="${final_temp_filepath_md5}.${file_extension}"
 
-    echo "$final_filename,$url_to_download" >>$furry_commission_ideas_urls_filename
+      cp $downloaded_image_temp_path ./${final_filename}
+
+      echo "$final_filename,$url_to_download" >>$furry_commission_ideas_urls_filename
+    done
   done
 
-  rm $tmp_dir/$tmp_filename
+  rm $downloaded_image_temp_path
 }
 
 fill_existing_folders_array