Changed generated queries to use VALUES {} construct and simpler regular expression
Enabled multiple target strings in one instance