diff --git a/Emby.AutoOrganize/Configuration/autoorganizelog.js b/Emby.AutoOrganize/Configuration/autoorganizelog.js
index 214c72e..aa0025e 100644
--- a/Emby.AutoOrganize/Configuration/autoorganizelog.js
+++ b/Emby.AutoOrganize/Configuration/autoorganizelog.js
@@ -193,11 +193,16 @@
             return;
         }
 
-        var message = 'The following file will be moved from:' + '<br/><br/>' + item.OriginalPath + '<br/><br/>' + 'To:' + '<br/><br/>' + item.TargetPath;
+        for (var i = 0; i < item.DuplicatePaths.length; i++) { //remove the target filename from the list (as we will overwrite it and better for display)
+            if (item.DuplicatePaths[i].replace(/^.*[\\\/]/, '') === item.TargetPath.replace(/^.*[\\\/]/, '')) {
+                item.DuplicatePaths.splice(i, 1);
+                i--;
+            }
+        }
 
-        if (item.DuplicatePaths.length) {
+        var message = 'The following file will be moved from:' + '<br/><br/>' + item.OriginalPath + '<br/><br/>' + 'To:' + '<br/><br/>' + item.TargetPath;
+        if (item.DuplicatePaths.length > 0) {
             message += '<br/><br/>' + 'The following duplicates will be deleted:';
-
             message += '<br/><br/>' + item.DuplicatePaths.join('<br/>');
         }
 
@@ -386,9 +391,9 @@
 
         var html = '';
 
-        html += '<td class="detailTableBodyCell">';
+        html += '<td class="detailTableBodyCell" style="width:25px">';
         var hide = item.IsInProgress ? '' : ' hide';
-        html += '<img src="css/images/throbber.gif" alt="" class="syncSpinner' + hide + '" style="vertical-align: middle;" />';
+        html += '    <img class="' + hide + '" src="data:image/gif;base64,R0lGODlhGQAZANUAAHyyRMTarOTu1JzCbPT67NTmvIy+XPT27KzOhOz25Pz69MzitOzy3NzqzJS+XLTWlIS6VNTqxLTSlPz+/JTCZHy2RMTerOTy3KTKfPT69NTmxKzSjPz6/MzivOzy5JS+ZP7+/gAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH/C05FVFNDQVBFMi4wAwEAAAAh+QQJAwAgACwAAAAAGQAZAAAG1cAJZwIaGonHpBC0BDmf0Kj0Kawqr9Yqk7NFOi2fgJMo5U6dCoBawbw0MlHtUOOpUiqUyWShpiisY04aAAZkHAJmH2oAEVJIDAYSZEVjGIsXUHJZTkNFCRgGC1lZWEkcSoGUZ1AXBXCZIIiOUQ1qDq9WAKJGXUVCD5dDWhelVg0VhH9mk6tQAq5xnM2rmry9RQQCesuaHQxLWQcQAAHgZlQfHWcXaghThkRkGhQNYwEIHtFcmiASABtFOmnx1enKAQsHqmzqNK0hFYfTkJgbs+zJuQlBAAAh+QQJAwAhACwAAAAAGQAZAIV8skTE2qzk7tSkxnT0+uys0oycxnTU5sSMulz09uyEukzs9uS81pzM4rTs8uSszoT8+vyEtkTk8tykynS00ozc6szE3qzk7tz0+vTU6sSEulS82qTM4rz8/vyEtkykyny00pT+/v4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAG08AOpBMaGonHpDC0DDmf0Kj0Kawqr9YqE7JFOjOfg5Mo5U6fCADimZCQqcNi50IwFgCFYSYC+HSsY04CAAZUCWQDAIoXUkgYBhZQZBAUigAEknFKTpoYBQYVWVlYpFpMnGeSFQEOUUQLZpJRDYoKCWNGHgeAWkYPlqFHIbCjo7QAHnVkb6lUBxatskXNqb2AXZwOFUZj1gwCmlYOihRLTU8QCgxnFYqFjZxDZA0aDZwUBgKu039cS4kT5CBp0g+JEgkMJGCRQ62hNIfV5PgzQxAdlSAAIfkECQMAIwAsAAAAABkAGQCFfLJExNqkpMp85O7UlL5k9PrstNaUhLpU1ObEtNKU9Pbs/Pr0hLZEzOK0rNKM7PLkzN60rM6E5PLcnMZsvNacjLpU3OrM/P78fLZExN6s5O7c9Pr0/Pr8hLZMrM6MnMZ0vNqkjL5c3OrU/v7+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABtvAC+cyGhqJx6RwtBw5n9Co9CmsKq/WKpOzRTolCY2TKOVOnx/Ah6ogU4fFi+IY6GSEmgMgcbGOnQoADlBuCQCHBVJIGx4IhE4cIIcHC4RwQ35bTAsgCQNZWVhHCxekR39FZ4QQBgNRRG2KUZIADA9jcBUWflpGE4cADVkjbaJVFIcYD3BMqoqsro+pzme9mVpMIg0bzKccHBEIS1kWhwKXbk4PGB5QlU4NhyFTZHLMBgAUThsCFY6PXLQsIQCAwJaA3awduSAigogqw5hRm4iKoiok48w0cWOGSRAAIfkECQMAJQAsAAAAABkAGQCFfLJExN6spMqE5O7UlMJk9PrstNaU1OK8hLpM9PbstNKU7PbkhLZEzN60rNKM/Pr8vNac3OrUrM6M7PLknMZs1Oa8jL5czOK0vNqcfLZEpM6E5O7c9Pr0hLpU7PbshLZM/P78nMZ01ObEzOK8vNqk/v7+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABtBA0ANUGhqJx6SwtCw5n9Co9CmsKq/WKvOxRToTgYSTKyVOnw6AhGqGao9VEUEkTBA+gazT/EBAzhgAABlkbkUgEANQZCAjggRtXYdHY0ggFxAeWJtZWHtjZ24NBoqGCZGfUCSCDBN7QyUWEVaSRhSCABd6p5xDEIIZE7BMoWWjpVSgxWdvtJJMI5lNIG8FIQGwSY4ABNmoGwAhVBNmvwAMhclMAwVkEgACXwQMAVFeRlslCAAIk87U3pJUoHCg05ImyxKmUhjKEpdpjJ4UAhEEACH5BAkDAB8ALAAAAAAZABkAhHyyRMTapOTu1KTKfPT67NTmxIy+XPT27LTWlMzitOz25Iy6VOzy3LTSlPz69IS6TMzetKzOhNzqzJS+ZMTarOTu3PT69LzapMzivOzy5Pz+/IS6VKzOjNzq1JTCbP7+/gXHoOZo32iSZyp+6+e+cCy/Yq3eds06O+o6BYuLJOPNXhfA5UgblTRQU2VQEVkGhkJu+JtAjgkAwDBDaSgZGNHREQ+IQ+couiZBJYlDLofr61g/TDQSaDEkejJwLhhiDwdxJAsSNj1PDhFiAJMnH3p+I4wAji2KgiUFAQqGgaZlcnQ/pBcNAqQ6DhkGDSs5SQAbrzEFY2sdRByZj6ssBRkoHgAeJBULALtqJZY7FpkmDgR/nCpnEwE1IiY7retc7ExmPKRGcEYsIQAh+QQJAwAdACwAAAAAGQAZAIR8skTE3qycxnTk7tT0+vSs0oyMulTU5rz09uyEtkSkxnTs9uT8+vS00ozs8uSUvlzc6sykynT8/vy01pR8tkTM4rzk8tyMvlzU5sSEtkz8+vy00pSkynz+/v4AAAAAAAAFzqCkSd1okmcqdmvnvnAsv2Kt3nbNajvqSgNSaSacuSqAipE2KuU0i82ithEETz+XRnAwQgAAAdGJWcB4LAe4Uew5sc6SxoGR5J74k12VHS5fFgcEMSQObVoxXwAPgz0SGQdYJj0TYAAWIzoOOCkQFAAXDC2Hfx0DgoSIpURNelotBA0CEE1vKAMZAna2Gg1gFAgohwEAGWgIB2YdCpYWMkIaAQM8BBcABoOeABFtPjojagAUhhoIFjq2vHYFCQWZKTurpEbzq6mTo2hFaCwhACH5BAkDABsALAAAAAAZABkAhHyyRMTapOTu1KTKfPT67JS+XNTmvPT27Oz25MzitOzy3Pz69JzGdIS6VMTerLzWnJTCZNzqzIS2TMTarOTy3KzOhPT69JS+ZOzy5Pz+/Nzq1P7+/gAAAAAAAAAAAAAAAAXMYLZk22iSZypu6+a+cCy/Yq3eds0uO/oetBlv9tIAIkTaqJRbWB6WmqOCyblIpYGGKAAAKjNUJgIMliwNQAB7Xapc7syB0qzjTLcrPAk7aNh6AhYygBsYXgxYNQcADjY9TAsOXgAWIzqCdzUYEgCJLYV8Gwh/MVhDooRxlqctCAMXCaA6CwYAFys5A5QUPC0vD14ELhQTGC4XlEimLgcPsqOdEggbCV4Qg0G+GWJGXhHcFAYmV7QqDJ4il+S/RBkEoWGpqWK+Q6AvqBkhACH5BAkDAB0ALAAAAAAZABkAhHyyRMTerOTu3KTKfPT67Iy+XPT27Iy6VOz25LTWlPz69IS6VNTmvJS+XIS2TOzy5KzSjPz+/JTCZHy2RMzitOTy3KzOhPT69Oz27LzWnPz6/NzqzJS+ZP7+/gAAAAAAAAXPYKRF3WiSZyp2a+e+cCy/Yq3eds1qO/ryLpIMOHNVAI8ibVTKaTQURY2RuaSCLo1lUzQAAIkZKrIxwISjAoBB7DVP2bGG4Kzj7kK0EnZ5CGkRDBhDMQZqEEsaAmBwJj0MXw41EZQRFAZ2NhgHABCOJXsyCn4xeqFiTCMVmHFACAMcFC2UqQEAC6wpA18AFTwtLxZfFS4bCVwdHLzIZy4PFgEkAg7DHRRfEhfNv6mBvGwRFRt0QLRyInNqBQRPCo1/RQoVCqcs9aFyO0HlPzQhACH5BAkDAB8ALAAAAAAZABkAhHyyRMTapOTu1KTGdPT67JTCbNTmvLTSjIS6VPT27Pz69MzivOz25KzOhIS2RMTerOzy5KTKdNzqzLzapPz+/MTarOTy3PT69JzGdNTmxLTSlIy+XPz6/IS2TKTKfP7+/gXGIMVR32iSZyp+6+e+cCy/Yq3eds1yO0q/PBlp9mJ0GETaqJQbZWyCh8o15HgkRA4A8JihKJIErEqJdCRD6nLKZFLeuHjzRnUFk9SL8DIRCGMKBQABShQGAB4nTDw1ElsbLHAcCn1yJoIBIkFpeDQKfyWdRDojEhBkQRcHGBJLiygaW6evHAdbAASMdy4YW1gUCw0LJL1bFqACGAckGbdYjgARnD6kFAG3AQoUCRZwVNUnEAgACAx0LUkEYaIs7J1fump1djQhACH5BAkDAB4ALAAAAAAZABkAhHyyRMzetKTKfOzy5JzGbNzqzIS6VLTWlNTmvLTSlPT67IS2TKzOhOTu1NTivIy6VPz+/Hy2RMzitKTOhOz25JzGdNzq1LzapNTmxPT69IS2VKzOjOTu3Iy+XP7+/gAAAAXBICR6YgmRZnqOXuu+cOyqdG2i6Drv8Sm7ikfmNxvVCqYBRtXyQQiSH6QDwMhWGcfg5fQkOgNf05ga52yiDEStTrvZ63izNSTaSRSGoweDCDQIRRAXAB03JTkDAAAVZxADeiltcWoMCw6IJHebmp2cXEYZARZOLIMJDaaIfotIjoQAC2QwDwARASQXBAknG4sACnweGB0CQwGLC7gNtbxcmqsQCb8HJQqZh21qDYsRqRmTK2I/AxJbm+OffNFmnmIQIQAh+QQJAwAbACwAAAAAGQAZAIR8skTE3qzk7tSszoSUvmT0+uzc6syMulTM3rTs9uy01pScxmz8+vSEtkzs8uTM4rS81px8tkTk7tyUwmT0+vTc6tSMvlycxnT8/vzM4ry82qT+/v4AAAAAAAAAAAAAAAAFxSDGYNtokmcqbuvmvnAsv2Kt3nbNMjtKvzwZafaiHChE2qhUa1YwNYoAenINGYdA8gKQzFCYgPdX2gQuhaB1qXKxVzmcPK5juZN4q2ECEcoUExVKGAMAAFUmPQyGA4oYFQQKdCoKBE9LZXmaV5pfbAkQGUN1GBkQCS1UJBgEEQCiTCYZhgRQTDAMDYZ9GBAXECQQhg1DMEMBDRMJGwiGAAgbCRMNWsZlcQoArpJtsWAnAq4RAjc7eQ4PDp3FnUTf5vDFahghACH5BAkDACAALAAAAAAZABkAhXyyRMTapOTu3KTKfPT67JTCZNTmxLTWlIS6VMzitPT27Oz25LTSjPz6/IS2TMzetOzy5KzOhNzqzLzWnIy6VHy2RMTarOTy3PT69JzGdMzivPz+/KzOjNzq1LzapIy+XP7+/gAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbKwE1jAxoaicekELQEOZ/QqPQprCqv1iqzsUVSn1wpcfpUUBRk6rC4UWQlG+siGx4rKpw0x7GYIjcMBlBjXAYRa2p/R05rRl1YkHRZTn9plpQPFQNhX1EPAxeJBQAAAlqOWg4AE48bDwAZkkoPGRBaRUxjl2SEu36NAhwBhE0bHQkYiIsbCKQeikISpJuVZaQVDEUJERpECaQffkwMAA4CINKkghgDH4KDuHEYVQHXw43Fpw1HEM18V1suKZBAwJcuX7zYcClWBwyVIAAh+QQJAwAfACwAAAAAGQAZAIR8skTE3qykxnTk7tT0+uyUvlys0oyMulTU5rz09uz8+vS82qSEtkTs9uS00ozc6szs8uScxnTU6sT8/vy01pR8tkSkynzk8tz0+vSUwmSMvlzU5sT8+vyEtky00pT+/v4Fy+DETd9okmcqfuvnvnAsv2Kt3nbNcjtKvzwZafaCdCBE2qg0GWBOiFPO5BoOAJHkoqOYoTCRACxIGiyWShTn5FquedNcXIqrTiDdpL7kABwSMUMwGw6AVSMVAAAbOlQ6GQBiOR5+CXM2Gx6WaCMNGHt6Q0GggW4PEQ6fPW0QD1QsOgmJAA4oNhCJDm6CHxeKFVkfDxQPLg+KwYEsFgAMGx8QvwMsDhHTMD4jF5sIigBRKzpMu2siGBoVBU9TO3sKA6OhpHu2cGRkQDQhACH5BAkDAB0ALAAAAAAZABkAhHyyRMTapOTu1PT67KTKfJS+ZNTmxPT27Oz25MzitOzy3Pz69JzGdIS6VMTerOTy3LzapJzCbPz+/IS2TMTarOTu3PT69KzOhJTCZNzqzMzivOzy5Pz6/P7+/gAAAAAAAAXMoMRJ3WiSZyp2a+e+cCy/Yq3eds1yO/paL56MNHsJAIIibVSSaB4mi8OSywmJGkCDKEsUuDBUpXHhXjsbDSvMHEkWrZVOZa3jTi5RBqHs5yMAEw8xQjAVEAtLBwCMEHNyTAQABj0SEhiMCnc1Aog6O3t+fUSFomwkEl4EfE1XBw+feBWMAAQoNhYTABSQMBm0BS4PFAouswAXMyQWBYwJHQi6E3wSDhcbMT5vBrAcv4wZj1ePlm4MAAzlOU1+EgNgSvCmQ607eWcuhRIhACH5BAkDAB4ALAAAAAAZABkAhHyyRMzitOzy5KTKfIy+XOTu1PT67LTSlNzqxIy6VPT27JS+XPz69NTqxOz25KzSjOTy3LzWnJTCZIS2TNTmvKzOhOTu3PT69LTWlNzqzIy6XJS+ZPz+/Oz27P7+/gAAAAXHIMdw3miSZyp6q+e+cCy/Yq3eds0yO+pyFlJpJpy5KICAkTYqXSIUjqiDUeRUP1cEAFAYMxUjCkko8lgeRQbNRHGszZKbd63j7sJ3wLLsuxgEXA0xZzAdAUUiFlwABzomPR4HAAU9DBcagngjhyc/CgGVfktChaMwOhwBGwMOfy0iFzpyTYtcA3M1gRRNcS4ZjAQuChQdw1wRRB4XG1xKmAAJFywUEdOoQyINEFICjA6Qs54qHA8TD3Y7o0V+7KfK4WewL4UcIQAh+QQJAwAdACwAAAAAGQAZAIR8skTE2qTk7tSkxnT0+vTU5ryMvly00oz09uzM4rTs9uz8+vTc7tSEtkTs8uSkynTc6syUwmS82qT8/vzE3qzk8tzU5sS81pzM4rz8+vyEtkykynyUwmz+/v4AAAAAAAAFyOCUTd1okmcqdmvnvnAsv2Kt3nbNZjvqEgWCiycjzV4SgORIG5Uqm8tEJNgIcjmicQMAMI6JCDGGugAaCtqw48CwYLoRQ+EsoVbZLG7fmjgkFkZMTAgaXQkxYy8EEHAZFl0AG3F4TgEAaTUThYd8I4w2Ln4SBYKDM1qnR3EQAwdCPUNTJqI6CJEHdycDGgxOdS4VkQM/ArAThhQzJBNcAI0THAAcKAwUim88UxUEn5ELlFpxI+AjAQYBedrYqoOm7ct266Kpa6IhACH5BAkDAB0ALAAAAAAZABkAhHyyRMTapKTKfOTu1LTWlNTmvPT69JzGdLTSlIS6VKzOhNTivOz25IS2TMzitKTOhOzy5LzWnNzu1Pz6/Hy2RKTKhOTu3NTmxIy+XKzOjMzivLzapPz+/P7+/gAAAAAAAAXEIDdx3WiSZyp2a+e+cCy/Yq3eds1OO+oyAYaLJyPNXgpA5UgblS4YgUGkwRRwJpcRAwA4jpsGMYYSdCUvImkQ4Ri1TpFD0lqJeLmUCeu+DS0RDm9MRwwNXQFkMhMQMHJdAAc6WToOFHgmEBSIeXmMNlpsgoSEaqRHkxYZAUZZPTolOhwJXRsoOQgYEHZjHQZdFApau1pcFzMoBAANFi5JAkMQF4MsJSwcBlm0Cde3apMqCwcLE+U5safpWuqE3jtw60M0IQAh+QQJAwAhACwAAAAAGQAZAIV8skTE2qTk7tSszoT0+uyUvlzU5sT09uyMvlzM4rTs9uS01pT8+vScxmyEtkTM3rTs8uSUwmS81pz8/vx8tkTE3qzk7tyszoz0+vSUvmTc6tTM4rzs9uz8+vycxnSEtky82qT+/v4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAG0sBJZxIaGonHpDC0DDmf0Kj0Kawqr9Yqs7NFOjUDjZMo5UYn5FAGkJlCtZ0ApaAYLgASKydrJk4oAHhPGFADDhxTSGsACVROXAYDQ2+THQoLCU1LcFl8HVigZBMCCw9pbqgQgQAgZ1ITB5QJqw2cXFoaCEhoHRCArKFDsFZjpKaoyEVjyW5wHBIbopNFu31aExmAmdRHAR4YlacdH4ESTwxQHgACiU4VDhGIIRIU5kwYAqdMynxqbEXhrAWsMgGMBl5ZqDFbuIwhqmpbxvR5YoZJEAAh+QQJAwAdACwAAAAAGQAZAIR8skTE2qTk7tSkynz0+uyUwmTU5sS01pSEulTM4rT09uzs8uSs0oz8+vyEtkzM3rTk8tyszoR8tkTE3qzk7tz0+vScxnTc6tS81pyMvlzM4rz8/vyszoz+/v4AAAAAAAAFzeDWbN1okmcqdmvnvnAsv2Kt3nbNNjvqPoWHiyTjwTaKyhAAcBhnPRanKdhsBgCLtUGgbHWsjgIgAQxcDcjTAhDMSBUHE0NDdyYWwjPaEAwwI2goKzkqVoWIKUMUBw97UFALcgABMUQwDQtHDRpMWTomUQkSPDaSc4k2mTZDAgcJl5BQRrGyloENFQkXRGC4LV8lWAC8JTkGEaEtLxlkQjMRAJoyRAYZA0odDwgJQ1zUJXwkWGcNv7SghRAYal/Kj7a2tfFvxqW0tC9PGyEAIfkECQMAHQAsAAAAABkAGQCEfLJExNqk5O7UpMp89Pr0lMJk1Oa89PbsvNqkjLpU7PbktNKM7PLc/Pr03OrMhLZErNKM1OrE/P78xN6s5O7crM6MnMZ01ObEjL5ctNKU7PLk/Pr8hLZM/v7+AAAAAAAABc6gtEndaJJnKnZr575wLL9ird52zW47yi4ciE9GgkkoB5cGwFTMaKOShXmREBKABEGkqeZcJAoTYHERDEkWBnCZkQ7jCs3Fy2A0RXB0c7FADkV7OSc5Eg2DhSpgDAgGeU+QChxMEzGPZg5GfGMDOiY9HQEATjYHkwATiCkEDjZgFI2XkER0s5CeEg4MgS0rOiWeGUx4wCcCCJ8tL1MAmTMIHA1uLgIWC0UXBc4NGwS0PLgdCwAQwCi9uCkHE4AbilG28XPys+fgPDtgL/gsIQAh+QQJAwAdACwAAAAAGQAZAIR8skTE2qTk7tSkynT0+uzU5ryUwmT09uzs9uS82qT8+vSMulTM4rTs8uS00pSEulTk8tyszoTc6sz8/vyEtkzE3qzk7tykynz0+vTU5sScwmz8+vzM4rz+/v4AAAAAAAAFzOC0Td1okmcqdmvnvnAsv2KtTsdk7yO7+aiSBqDBsGY/2EbSIEkAUMmM1lMYoIwJAgpAiAQVlcvJNbggAciYAqjMSA3uheYaaSgSEpU0YRguXnUoOjoqJoY8iUkbCBV5U5AvGAtQBTFJMAhZVE9QETUlK6AOAAJAExgPUByKNponY42PkZBJerQyoCMQOYK2P6ChPRsVAA+9Kg0MJj4xEVBqM363MHoNERV6AhcWYyW537okCQAJwkC+gykKGQqKzbjxR/KQ6vAtt5gTIQAh+QQJAwAdACwAAAAAGQAZAIR8skTM4rTs9uSkynzk7tT8+vS01pSUvlzc6szU6sTU4rz09uy00oyMulzk8tz8/vy81pyUwmTU5rz0+ux8tkSszoTk7tz8+vyUvmS00pS82qTU5sT0+vT+/v4AAAAAAAAFzuBzPd1okmcqdmvnvnAsv2KtFhZn7yN7+ajOokFpLFizH6yQEPwCgGhgRutxItILghIlPB4SCCflIiGigIYLUUG4FlHDjGRBD2iuUQMgUZZ7DwENAwIkJShfC18nNiM8jyp5HBIWVJYwF0QAbjCGMBYaBVUOaAY1hz+nA3xAelwIkDYEoSZlEwoOl7pKnroxpyMTPah/QHnAG2lfqDULsD3DLxBcE1RsVIYLBhKGAhkCedglxj1QU7WnzMwmF14q0L2+uvHyMoipvLwvfg8hACH5BAkDABwALAAAAAAZABkAhHyyRMTapOTu1KTKdPT67NTmxLzapJTCZMzitPT27LTSjOz27KzSjPz6/IS6VMTerOzy5KzOhNzqzIS2TMTarOTy3KTKfPT69NTqxJzGdMzivPz+/P7+/gAAAAAAAAAAAAXL4NZs3GiSZypyK+e+cCy/Yq0mRWLvI9v4KA5kAphAWLMfrCGBkAyAqGFG6zUOUcSmEAUUNhtKxHlykSTdAwsx0HIE0ciMBOlaXsoNwQEIkKokGwgHFgt/Vg0EAmAnNioqPDUuIxILVJcwGxlFFTFKMBgKCVUEXQ8mQCUrWA9AI5sTFY87BaKoPpWYuoe6VJKNky0rkqpWAhMZYMU1EAioLS8PRZ8xg38xhw8CShcBF2YlMkG/ZwASxanLyyeGs6q98ODxlyjDeXl4NCEAIfkECQMAHAAsAAAAABkAGQCEfLJExNqkpMp85O7UnMZs/Pr0hLpU1Oa8vNac9PbstNKU7PbkhLZEzOK0rNKM7PLk/P78jLpU3OrMrM6E5O7cnMZ0/Pr81ObEvNqkhLZMzOK8jL5c/v7+AAAAAAAAAAAABc8gZEHcaJJnKnIr575wLL9irT7aY+8ja/koDoUBYFBYsx8MMli4EICoYkbrWQjRi6URBTRECsJg5yINugQWphIgSaJpGenRndBcliFAQaqSIAcEEwl9PRAQDxeHJzYqKY41eIgJVJVLEwAblEsyDQJHZSMZUQcmQCUrowgsixCYBoSQIxANFQ8WPagLBZa9hb1UkbO5pj6nqFYPG3w/PAMIwn0vF5nSMQgZSjF9EBc6eBqFh3IlyMZ0D6fFrcg1hzw2xsDzSPSVKCst+i/aECEAIfkECQMAIgAsAAAAABkAGQCFfLJExNqspMp85O7UlL5k9Prs1ObEtNaUnMZsjL5c/Pr0hLZEzOK0tNKU9PbsnMJszN60rM6E7PLklMJk3OrMvNac/P78fLZExN6s5O7c9Pr0nMZ0/Pr8hLZMrM6MlMJs3OrUvNqk/v7+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABtxAC8ciGhqJx6RQtBQ5n9Co9CmsKiUMiXU7ZHK8SNHgArgMilMi1CIpOBuA+GFK7VoEgA6Fw4gDIBYaAgkGW05EEn4CRSEIIQoiEHEJaSIOC3ENVIcUcQJqh10cFBsHGl9eTBYUDA5br0JKslaHIgqgdLlMARcPGlG4ThUTFHUWCXEDVUVLVQpxEWBDvB8aXFwHBCDLaLe632qo31LLSaHhSE0W5QUbGKJbBhFGqVAZABu5EQAOlUwDBVBZ2BaqHzA09JYUSNCvnDqHs2YxG0exVsVc6b6oE/hEnIUgACH5BAkDAB8ALAAAAAAZABkAhHyyRMTapOTu3KTKdJTCZPT67Iy6VMzitIS6VLTWlIS2RPT27NTivOz25KzSjPz6/KTOhIS2VNTmvHy2RMTerOzy5JzGdPT69MzivLzanIS2TOz27Pz+/KzOjNTmxP7+/gXPIPdw32iSZyp+6+e+cCy/Yq1WWGXvI/v4qI9AAVAIWLMfjHNRJgDQhItDitVYT4SAc4ACDpwFQUPZTT8Lb4cVsGR+GehEuSwhoAGa64GBEqpTPQ8CDgEtK1QHGTonOyIqJg+SPGclM5cyHB4GHYCVNBAaEjQjA1ALVyY+DxVQFkCSHgidkDVUAwYYqkiYvXWWvjOpNoFVgoepDx0SiCkUFgXHMRsTa5cWAEeZews9JWB7BVtWllcrFRMVQCXIx421qi3B857zwuw/h0qAdBwhACH5BAkDAB0ALAAAAAAZABkAhHyyRMTapOTu1KTKfPT69JS+ZNTmvPT27IS6TOz25LzWnOzy3Pz69MzivLTSlJzGbNzqzIy+XPz+/IS2TMTerOTu3KzSjJTCbNTmxIS6VLzapOzy5Pz6/P7+/gAAAAAAAAXXoMRJ3WiSZyp2a+e+cCy/Yq0eWGLvI8v5qE4FAZgsSjNSTKLUAJ4aF4OgpPU4lEkhwTE8AQZJJQNwME0u1FfBogwoJMeXICNJCs8GTeosVoElCRoNTC5XDBoOAjs8EgyNTI+PJ2mGM3V0SxUPAXUxDBcAnWkjchNnKCs1EE8RLKgCDxoqtKEBIj9Il0kMnrq7lzUlNqRKI8SvVxIKAsonDhEbqrkvHAhsSREAGEmGxy4EAZkcGxh/LEhnPh2sEK+puaglKhI6HPc7w8D7vvzA8OsCVqEmIQQAIfkECQMAHgAsAAAAABkAGQCEfLJExN6s5O7UpMZ09Pr01OK8rM6EjL5c9PbsjLpUzN607Pbk/Pr03OrMtNKMhLZE7PLkpMp01Oa8rNKMzOK0/P785PLcrM6MlMJk/Pr8hLZMpMp81ObEzOK8/v7+AAAABctglVXeaJJnKnqr575wLL9irRINYe8jm/kozyIBSCxKM9LMFQA4Ay6ERUnrZTiHDSHTcAIaFY4GEKnYXMqDU8HqGCikgdciQ22cDRp64iXAaiUECmBKVgQOERw7PGYqjmcsLj9LMAwQVGgIFxx1MQhqE1UVTRgnJSs1HV6NIhkLm4wpnwAOgJGUMgSXMYW4lIApaD2nkKynHZc/iwMahKe8GBRLGU9JkkFCDkcsAgGYkcpWJKrSJkDX4ikZArEo376+7/Cd5i32L5MsIQA7"/>';
         html += '</td>';
 
         html += '<td class="detailTableBodyCell" data-title="Date">';
diff --git a/Emby.AutoOrganize/Configuration/autoorganizetv.html b/Emby.AutoOrganize/Configuration/autoorganizetv.html
index 094a2e7..52a5711 100644
--- a/Emby.AutoOrganize/Configuration/autoorganizetv.html
+++ b/Emby.AutoOrganize/Configuration/autoorganizetv.html
@@ -180,8 +180,14 @@
                         </table>
                     </div>
                 </div>
-
-                <br /><br />
+                <br />
+                <div class="checkboxContainer checkboxContainer-withDescription">
+                    <label>
+                        <input type="checkbox" is="emby-checkbox" id="chkAllowTBA" />
+                        <span>Allow episodes titled 'TBA'</span>
+                    </label>
+                    <div class="fieldDescription checkboxFieldDescription">'TBA' is often set before the true name of an episode is known. Disabling this will prevent episodes being moved until a valid name is provided.</div>
+                </div>
                 <div class="selectContainer">
                     <select is="emby-select" id="copyOrMoveFile" label="Transfer method:">
                         <option value="true">Copy</option>
@@ -189,11 +195,20 @@
                     </select>
                     <div class="fieldDescription editorfieldDescription">Copy or move files from the watch folder</div>
                 </div>
-                <div>
-                    <label class="checkboxContainer">
+                <div class="checkboxContainer checkboxContainer-withDescription">
+                    <label>
                         <input type="checkbox" is="emby-checkbox" id="chkOverwriteExistingEpisodes" />
                         <span>Overwrite existing episodes</span>
                     </label>
+                    <div class="fieldDescription checkboxFieldDescription">This option allows you to overwrite files matching the destination name</div>
+                </div>
+                <div class="checkboxContainer checkboxContainer-withDescription">
+                    <label>
+                        <input type="checkbox" is="emby-checkbox" id="chkSingleEpisodeVersion" />
+                        <span>Only keep single format of episode</span>
+                    </label>
+                    <div class="fieldDescription checkboxFieldDescription">Enabled  - Sorting will enforce a single copy of an episode, removing any copies regardless of the file pattern set.</div>
+                    <div class="fieldDescription checkboxFieldDescription">Disabled - Sorting will allow multiple copies of an episode, as long as the file pattern does not match.</div>
                 </div>
                 <div class="inputContainer">
                     <input is="emby-input" id="txtDeleteLeftOverFiles" type="text" label="Delete left over files" />
diff --git a/Emby.AutoOrganize/Configuration/autoorganizetv.js b/Emby.AutoOrganize/Configuration/autoorganizetv.js
index 02bbd48..0401e6a 100644
--- a/Emby.AutoOrganize/Configuration/autoorganizetv.js
+++ b/Emby.AutoOrganize/Configuration/autoorganizetv.js
@@ -141,7 +141,9 @@
         var tvOptions = config.TvOptions;
 
         view.querySelector('#chkEnableTvSorting').checked = tvOptions.IsEnabled;
+        view.querySelector('#chkAllowTBA').checked = tvOptions.AllowTBA;
         view.querySelector('#chkOverwriteExistingEpisodes').checked = tvOptions.OverwriteExistingEpisodes;
+        view.querySelector('#chkSingleEpisodeVersion').checked = tvOptions.SingleEpisodeVersion;
         view.querySelector('#chkDeleteEmptyFolders').checked = tvOptions.DeleteEmptyFolders;
 
         view.querySelector('#txtMinFileSize').value = tvOptions.MinFileSizeMb;
@@ -170,7 +172,9 @@
             var tvOptions = config.TvOptions;
 
             tvOptions.IsEnabled = view.querySelector('#chkEnableTvSorting').checked;
+            tvOptions.AllowTBA = view.querySelector('#chkAllowTBA').checked;
             tvOptions.OverwriteExistingEpisodes = view.querySelector('#chkOverwriteExistingEpisodes').checked;
+            tvOptions.SingleEpisodeVersion = view.querySelector('#chkSingleEpisodeVersion').checked;
             tvOptions.DeleteEmptyFolders = view.querySelector('#chkDeleteEmptyFolders').checked;
 
             tvOptions.MinFileSizeMb = view.querySelector('#txtMinFileSize').value;
diff --git a/Emby.AutoOrganize/Core/EpisodeFileOrganizer.cs b/Emby.AutoOrganize/Core/EpisodeFileOrganizer.cs
index 8ce5d5c..ae2a081 100644
--- a/Emby.AutoOrganize/Core/EpisodeFileOrganizer.cs
+++ b/Emby.AutoOrganize/Core/EpisodeFileOrganizer.cs
@@ -188,12 +188,13 @@ await OrganizeEpisode(path,
             {
                 result.Status = FileSortingStatus.Failure;
                 result.StatusMessage = ex.Message;
+                _logger.ErrorException("Error organizing file {0}", ex, path);
             }
             catch (Exception ex)
             {
                 result.Status = FileSortingStatus.Failure;
                 result.StatusMessage = ex.Message;
-                _logger.ErrorException("Error organizing file", ex);
+                _logger.ErrorException("Error organizing file {0}", ex, path);
             }
 
             _organizationService.SaveResult(result, CancellationToken.None);
@@ -337,6 +338,7 @@ await OrganizeEpisode(result.OriginalPath,
             {
                 result.Status = FileSortingStatus.Failure;
                 result.StatusMessage = ex.Message;
+                _logger.ErrorException("Error organizing file {0}", ex, result.OriginalPath);
             }
 
             return result;
@@ -451,7 +453,11 @@ private void OrganizeEpisode(string sourcePath,
 
             if (!_organizationService.AddToInProgressList(result, isNew))
             {
-                throw new OrganizationException("File is currently processed otherwise. Please try again later.");
+                var msg = string.Format("File {0} is currently processed otherwise. Please try again later.", sourcePath);
+                _logger.Warn(msg + " Stopping organization");
+                result.Status = FileSortingStatus.Failure;
+                result.StatusMessage = msg;
+                return;
             }
 
             try
@@ -462,78 +468,87 @@ private void OrganizeEpisode(string sourcePath,
                 if (string.IsNullOrEmpty(newPath))
                 {
                     var msg = string.Format("Unable to sort {0} because target path could not be determined.", sourcePath);
-                    throw new OrganizationException(msg);
+                    _logger.Info(msg + " Stopping organization");
+                    result.Status = FileSortingStatus.Failure;
+                    result.StatusMessage = msg;
+                    return;
                 }
 
                 _logger.Info("Sorting file {0} to new path {1}", sourcePath, newPath);
                 result.TargetPath = newPath;
 
                 var fileExists = _fileSystem.FileExists(result.TargetPath);
-                var otherDuplicatePaths = GetOtherDuplicatePaths(result.TargetPath, series, episode);
-
+                if (options.SingleEpisodeVersion) //add value here to ensure returned to user regardless of result below
+                { 
+                    result.DuplicatePaths = GetOtherDuplicatePaths(result.TargetPath, series, episode);
+                    _logger.Info(string.Format("otherDuplicatePaths: '{0}'", string.Join("', '", result.DuplicatePaths)));
+                } 
+                  
                 if (!options.OverwriteExistingEpisodes)
                 {
-                    if (options.CopyOriginalFile && fileExists && IsSameEpisode(sourcePath, newPath))
+                    if (options.CopyOriginalFile && fileExists && IsSameEpisode(sourcePath, newPath) && result.DuplicatePaths.Count == 1)
                     {
-                        var msg = string.Format("File '{0}' already copied to new path '{1}', stopping organization", sourcePath, newPath);
-                        _logger.Info(msg);
+                        var msg = string.Format("File '{0}' already copied to new path '{1}.'", sourcePath, newPath);
+                        _logger.Info(msg + " Stopping organization");
                         result.Status = FileSortingStatus.SkippedExisting;
                         result.StatusMessage = msg;
                         return;
                     }
 
-                    if (fileExists)
+                    if (result.DuplicatePaths.Count > 0)
                     {
-                        var msg = string.Format("File '{0}' already exists as '{1}', stopping organization", sourcePath, newPath);
-                        _logger.Info(msg);
+                        var msg = string.Format("File '{0}' already exists as: '{1}'.", sourcePath, string.Join("', '", result.DuplicatePaths), (result.DuplicatePaths.Count > 1 ? "these" : ""));
+                        _logger.Info(msg + " Stopping organization");
                         result.Status = FileSortingStatus.SkippedExisting;
                         result.StatusMessage = msg;
-                        result.TargetPath = newPath;
                         return;
                     }
 
-                    if (otherDuplicatePaths.Count > 0)
+                    if (fileExists)
                     {
-                        var msg = string.Format("File '{0}' already exists as these:'{1}'. Stopping organization", sourcePath, string.Join("', '", otherDuplicatePaths));
-                        _logger.Info(msg);
+                        var msg = string.Format("File '{0}' already exists as '{1}'.", sourcePath, newPath);
+                        _logger.Info(msg + " Stopping organization");
                         result.Status = FileSortingStatus.SkippedExisting;
                         result.StatusMessage = msg;
-                        result.DuplicatePaths = otherDuplicatePaths;
+                        result.TargetPath = newPath;
                         return;
                     }
                 }
 
                 PerformFileSorting(options, result);
 
-                if (options.OverwriteExistingEpisodes)
+                if (options.SingleEpisodeVersion)
                 {
                     var hasRenamedFiles = false;
 
-                    foreach (var path in otherDuplicatePaths)
+                    foreach (var path in result.DuplicatePaths)
                     {
-                        _logger.Debug("Removing duplicate episode {0}", path);
-
-                        _libraryMonitor.ReportFileSystemChangeBeginning(path);
-
-                        var renameRelatedFiles = !hasRenamedFiles &&
-                            string.Equals(_fileSystem.GetDirectoryName(path), _fileSystem.GetDirectoryName(result.TargetPath), StringComparison.OrdinalIgnoreCase);
-
-                        if (renameRelatedFiles)
-                        {
-                            hasRenamedFiles = true;
-                        }
-
-                        try
+                        if (!string.Equals(path, newPath, StringComparison.OrdinalIgnoreCase))//dont remove file matching destination path
                         {
-                            DeleteLibraryFile(path, renameRelatedFiles, result.TargetPath);
-                        }
-                        catch (IOException ex)
-                        {
-                            _logger.ErrorException("Error removing duplicate episode", ex, path);
-                        }
-                        finally
-                        {
-                            _libraryMonitor.ReportFileSystemChangeComplete(path, true);
+                            _logger.Info("Removing duplicate episode {0}", path);
+
+                            _libraryMonitor.ReportFileSystemChangeBeginning(path);
+
+                            var renameRelatedFiles = !hasRenamedFiles &&
+                                string.Equals(_fileSystem.GetDirectoryName(path), _fileSystem.GetDirectoryName(result.TargetPath), StringComparison.OrdinalIgnoreCase);
+
+                            if (renameRelatedFiles)
+                            {
+                                hasRenamedFiles = true;
+                            }
+
+                            try
+                            {
+                                DeleteLibraryFile(path, renameRelatedFiles, result.TargetPath);
+                            }
+                            catch (IOException ex)
+                            {
+                                _logger.ErrorException("Error removing duplicate episode {0}", ex, path);
+                            }
+                            finally
+                            {
+                                _libraryMonitor.ReportFileSystemChangeComplete(path, true);
+                            }
                         }
                     }
                 }
@@ -541,8 +556,8 @@ private void OrganizeEpisode(string sourcePath,
             catch (Exception ex)
             {
                 result.Status = FileSortingStatus.Failure;
-                result.StatusMessage = ex.Message;
-                _logger.Warn(ex.Message);
+                result.StatusMessage = string.Format("Error sorting episode: '{0}'.", ex.Message);
+                _logger.ErrorException("Error sorting episode: {0}", ex, episode.Path);
                 return;
             }
             finally
@@ -624,7 +639,7 @@ private List<string> GetOtherDuplicatePaths(string targetPath,
             Episode episode)
         {
             // TODO: Support date-naming?
-            if (!series.ParentIndexNumber.HasValue || !episode.IndexNumber.HasValue)
+            if (!episode.ParentIndexNumber.HasValue || !episode.IndexNumber.HasValue)
             {
                 return new List<string>();
             }
@@ -643,9 +658,9 @@ private List<string> GetOtherDuplicatePaths(string targetPath,
                     // Must be file system based and match exactly
                     if (locationType != LocationType.Virtual &&
                         i.ParentIndexNumber.HasValue &&
-                        i.ParentIndexNumber.Value == series.ParentIndexNumber &&
+                        i.ParentIndexNumber.Value == episode.ParentIndexNumber.Value &&
                         i.IndexNumber.HasValue &&
-                        i.IndexNumber.Value == episode.IndexNumber)
+                        i.IndexNumber.Value == episode.IndexNumber.Value)
                     {
 
                         if (episode.IndexNumberEnd.HasValue || i.IndexNumberEnd.HasValue)
@@ -653,10 +668,9 @@ private List<string> GetOtherDuplicatePaths(string targetPath,
                             return episode.IndexNumberEnd.HasValue && i.IndexNumberEnd.HasValue &&
                                    episode.IndexNumberEnd.Value == i.IndexNumberEnd.Value;
                         }
-
+                        
                         return true;
                     }
-
                     return false;
                 })
                 .Select(i => i.Path)
@@ -677,7 +691,9 @@ private List<string> GetOtherDuplicatePaths(string targetPath,
                 // No big deal. Maybe the season folder doesn't already exist.
             }
 
-            return episodePaths.Where(i => !string.Equals(i, targetPath, StringComparison.OrdinalIgnoreCase))
+            //include all results (including direct matches to the destination path so they can be reported in UI
+            //removed on a case by case where called elsewhere
+            return episodePaths
                 .Distinct(StringComparer.OrdinalIgnoreCase)
                 .ToList();
         }
@@ -733,7 +749,7 @@ private void PerformFileSorting(TvFileOrganizationOptions options, FileOrganizat
                 }
                 catch (Exception ex)
                 {
-                    _logger.ErrorException("Error deleting {0}", ex, result.OriginalPath);
+                    _logger.ErrorException("Error deleting file {0}", ex, result.OriginalPath);
                 }
             }
         }
@@ -791,7 +807,7 @@ private Season GetMatchingSeason(Series series, Episode episode, TvFileOrganizat
                     if (!episode.ParentIndexNumber.HasValue)
                     {
                         var msg = string.Format("No season found for {0} season {1} episode {2}", series.Name,
-                            episode.ParentIndexNumber, episode.IndexNumber);
+                            episode.ParentIndexNumber.Value, episode.IndexNumber.Value);
                         _logger.Warn(msg);
                         throw new OrganizationException(msg);
                     }
@@ -866,7 +882,22 @@ private string GetSeriesDirectoryName(string seriesName, int? seriesYear, TvFile
 
             if (seriesYear.HasValue)
             {
-                seriesFullName = string.Format("{0} ({1})", seriesFullName, seriesYear);
+                var parsedName = _libraryManager.ParseName(seriesName.AsSpan());
+
+                var yearInName = parsedName.Year;
+                var nameWithoutYear = parsedName.Name;
+
+                if (string.IsNullOrWhiteSpace(nameWithoutYear))
+                {
+                    nameWithoutYear = seriesName;
+                }
+
+                if (!yearInName.HasValue)
+                {
+                    yearInName = seriesYear;
+                }
+                
+                seriesFullName = string.Format("{0} ({1})", nameWithoutYear, seriesYear);
             }
 
             var seasonFolderName = options.SeriesFolderPattern.
@@ -928,7 +959,7 @@ private async Task<Episode> CreateNewEpisode(
 
             if (episodeSearch == null)
             {
-                var msg = string.Format("No provider metadata found for {0} season {1} episode {2}", series.Name, seasonNumber, episodeNumber);
+                var msg = string.Format("No provider metadata found for {0} Season {1} Episode {2}", series.Name, seasonNumber, episodeNumber);
                 _logger.Warn(msg);
                 throw new OrganizationException(msg);
             }
@@ -1003,6 +1034,10 @@ private void SetEpisodeFileName(string sourcePath, string seriesName, Season sea
 
             var episodeTitle = _fileSystem.GetValidFilename(episode.Name).Trim();
 
+            if(options.AllowTBA == false && episodeTitle == "TBA")
+            {
+                throw new OrganizationException("Returned metadata title is 'TBA'. Current settings prevent this file from being moved.");
+            }
             if (!episode.IndexNumber.HasValue || !season.IndexNumber.HasValue)
             {
                 throw new OrganizationException("GetEpisodeFileName: Mandatory param as missing!");
diff --git a/Emby.AutoOrganize/Core/FileOrganizationService.cs b/Emby.AutoOrganize/Core/FileOrganizationService.cs
index 67ba8d4..1df5884 100644
--- a/Emby.AutoOrganize/Core/FileOrganizationService.cs
+++ b/Emby.AutoOrganize/Core/FileOrganizationService.cs
@@ -128,7 +128,7 @@ public void DeleteOriginalFile(string resultId)
             }
             catch (Exception ex)
             {
-                _logger.ErrorException("Error deleting {0}", ex, result.OriginalPath);
+                _logger.ErrorException("Error deleting file {0}", ex, result.OriginalPath);
             }
             finally
             {
@@ -177,11 +177,6 @@ public async Task PerformOrganization(string resultId)
                 default:
                     throw new OrganizationException("No organizer exist for the type " + result.Type);
             }
-
-            if (organizeResult.Status != FileSortingStatus.Success)
-            {
-                throw new OrganizationException(result.StatusMessage);
-            }
         }
 
         public void ClearLog()
@@ -203,11 +198,6 @@ public async Task PerformOrganization(EpisodeFileOrganizationRequest request)
 
             var options = GetAutoOrganizeOptions();
             var result = await organizer.OrganizeWithCorrection(request, options.TvOptions, CancellationToken.None).ConfigureAwait(false);
-
-            if (result.Status != FileSortingStatus.Success)
-            {
-                throw new Exception(result.StatusMessage);
-            }
         }
 
         public void PerformOrganization(MovieFileOrganizationRequest request)
@@ -217,11 +207,6 @@ public void PerformOrganization(MovieFileOrganizationRequest request)
 
             var options = GetAutoOrganizeOptions();
             var result = organizer.OrganizeWithCorrection(request, options.MovieOptions, CancellationToken.None);
-
-            if (result.Status != FileSortingStatus.Success)
-            {
-                throw new Exception(result.StatusMessage);
-            }
         }
 
         public QueryResult<SmartMatchResult> GetSmartMatchInfos(FileOrganizationResultQuery query)
diff --git a/Emby.AutoOrganize/Core/MovieFileOrganizer.cs b/Emby.AutoOrganize/Core/MovieFileOrganizer.cs
index 83d32d8..551f457 100644
--- a/Emby.AutoOrganize/Core/MovieFileOrganizer.cs
+++ b/Emby.AutoOrganize/Core/MovieFileOrganizer.cs
@@ -107,7 +107,7 @@ await OrganizeMovie(path,
             {
                 result.Status = FileSortingStatus.Failure;
                 result.StatusMessage = ex.Message;
-                _logger.ErrorException("Error organizing file", ex);
+                _logger.ErrorException("Error organizing file {0}", ex, path);
             }
 
             _organizationService.SaveResult(result, CancellationToken.None);
@@ -197,6 +197,7 @@ public FileOrganizationResult OrganizeWithCorrection(MovieFileOrganizationReques
             {
                 result.Status = FileSortingStatus.Failure;
                 result.StatusMessage = ex.Message;
+                _logger.ErrorException("Error organizing file {0}", ex, result.OriginalPath);
             }
 
             return result;
@@ -378,7 +379,7 @@ private void PerformFileSorting(MovieFileOrganizationOptions options, FileOrgani
                 }
                 catch (Exception ex)
                 {
-                    _logger.ErrorException("Error deleting {0}", ex, result.OriginalPath);
+                    _logger.ErrorException("Error deleting file {0}", ex, result.OriginalPath);
                 }
             }
         }
diff --git a/Emby.AutoOrganize/Core/MovieFolderOrganizer.cs b/Emby.AutoOrganize/Core/MovieFolderOrganizer.cs
index bd86f81..e5144d9 100644
--- a/Emby.AutoOrganize/Core/MovieFolderOrganizer.cs
+++ b/Emby.AutoOrganize/Core/MovieFolderOrganizer.cs
@@ -109,7 +109,7 @@ public async Task Organize(MovieFileOrganizationOptions options, CancellationTok
                     }
                     catch (Exception ex)
                     {
-                        _logger.ErrorException("Error organizing episode {0}", ex, file.FullName);
+                        _logger.ErrorException("Error organizing file {0}", ex, file.FullName);
                     }
 
                     numComplete++;
diff --git a/Emby.AutoOrganize/Core/TvFolderOrganizer.cs b/Emby.AutoOrganize/Core/TvFolderOrganizer.cs
index 701e06b..42e0bea 100644
--- a/Emby.AutoOrganize/Core/TvFolderOrganizer.cs
+++ b/Emby.AutoOrganize/Core/TvFolderOrganizer.cs
@@ -110,7 +110,7 @@ public async Task Organize(TvFileOrganizationOptions options,
                     }
                     catch (Exception ex)
                     {
-                        _logger.ErrorException("Error organizing episode {0}", ex, file.FullName);
+                        _logger.ErrorException("Error organizing file {0}", ex, file.FullName);
                     }
 
                     numComplete++;
diff --git a/Emby.AutoOrganize/Emby.AutoOrganize.csproj b/Emby.AutoOrganize/Emby.AutoOrganize.csproj
index a6541aa..df9db4f 100644
--- a/Emby.AutoOrganize/Emby.AutoOrganize.csproj
+++ b/Emby.AutoOrganize/Emby.AutoOrganize.csproj
@@ -2,8 +2,8 @@
 
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0;</TargetFrameworks>
-    <AssemblyVersion>1.6.0.0</AssemblyVersion>
-    <FileVersion>1.6.0.0</FileVersion>
+    <AssemblyVersion>1.6.1.0</AssemblyVersion>
+    <FileVersion>1.6.1.0</FileVersion>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/Emby.AutoOrganize/Model/TvFileOrganizationOptions.cs b/Emby.AutoOrganize/Model/TvFileOrganizationOptions.cs
index ed68930..05ff6e9 100644
--- a/Emby.AutoOrganize/Model/TvFileOrganizationOptions.cs
+++ b/Emby.AutoOrganize/Model/TvFileOrganizationOptions.cs
@@ -15,8 +15,12 @@ public class TvFileOrganizationOptions
         public string EpisodeNamePattern { get; set; }
         public string MultiEpisodeNamePattern { get; set; }
 
+        public bool AllowTBA { get; set; }
+
         public bool OverwriteExistingEpisodes { get; set; }
 
+        public bool SingleEpisodeVersion { get; set; }
+
         public bool DeleteEmptyFolders { get; set; }
 
         public bool ExtendedClean { get; set; }
@@ -45,6 +49,9 @@ public TvFileOrganizationOptions()
 
             CopyOriginalFile = false;
 
+            AllowTBA = true;
+            SingleEpisodeVersion = false;
+
             ExtendedClean = false;
         }
     }
diff --git a/Emby.AutoOrganize/thumb.jpg b/Emby.AutoOrganize/thumb.jpg
index dd0f8d7..442fe81 100644
Binary files a/Emby.AutoOrganize/thumb.jpg and b/Emby.AutoOrganize/thumb.jpg differ