diff --git a/pgbadger b/pgbadger
index 648d75e9..fdb145b0 100755
--- a/pgbadger
+++ b/pgbadger
@@ -5535,8 +5535,44 @@ sub normalize_query
 	%objnames = ();
 
 	# Remove string content
-	$orig_query =~ s/\\'//gs;
-	$orig_query =~ s/'[^']*'/\?/gs;
+	
+### BBO - 2023-10-21 - FIX - proper handling of balanced single-quoted strings with escaped quotes inside
+### Regexp s/\\'//gs removes \' (escaped quotes supposed to be inside quoted strings) from the query string
+### BUT
+### This simple regexp DOES NOT check for balanced quotes for the outer quoted string
+### and the quotes within quotes disturb the next replacement (Regexp s/'[^']*'/\?/gs)
+### where we remove everything quoted to replace it with a question mark (?)
+### Example#01 - Simple Case: Query string is: call foo('foo1 is \'foo2\'')
+### call foo('foo1 is \'foo2\'') >> call foo('foo1 is foo2') >> call foo(?)
+### >> In this simple case, the replacement works ok
+### Example#02 - BUG Case: Query string is: call foo(3, '\\some.site.com\folder\', 1000);
+### The problem here is that we don't want to remove the \' because it really is \'
+### and NOT an escaped quote inside another quoted string...
+### Replacement sequence is:
+### call foo(3, '\\rooterpd1v0166.corp.idemia.com\sftp_boomi$\cps\in\', 1000);
+###   >> call foo(3, '\\rooterpd1v0166.corp.idemia.com\sftp_boomi$\cps\in, 1000);
+###   >> and that's all :-( Normalization does not work in this case
+### Fix:
+### In order to properly handle single quoted strings with escaped quotes inside AND make sure outer single quotes
+### are balanced, we'll use a more complicates regexp
+### This regexp will replace balanced single quoted strings (including empty strings)
+### WITH escaped quotes inside by a question mark (?)
+### Matching pattern: s/((?<![\\])['])(?:\1|((?:.(?!(?<![\\])\1))*[^,\s]?)\1)/gs
+### Replace pattern: s/((?<![\\])['])(?:\1|((?:.(?!(?<![\\])\1))*[^,\s]?)\1)/\?/gs
+### Such Regexp testing can be done here:
+### https://rubular.com/
+###
+	$orig_query =~ s/((?<![\\])['])(?:\1|((?:.(?!(?<![\\])\1))*[^,\s]?)\1)/\?/gs;
+
+### BBO - 2023-10-23 - FIX - Additional replacement to handle a remaining case after previous regexp processing
+### Case remains because of the [^,\s]? part used previously to properly detect and split call parameters
+### Remaining case: '<any_chars><spaces or commas>'
+### Matching pattern: s/('[^']*[,\s]+')/gs
+### Replace pattern: s/('[^']*[,\s]+')/\?/gs
+	$orig_query =~ s/('[^']*[,\s]+')/\?/gs;
+
+	###$orig_query =~ s/\\'//gs;
+	###$orig_query =~ s/'[^']*'/\?/gs;
 	$orig_query =~ s/\?(\?)+/\?/gs;
 
 	# Remove comments starting with --