Modified Match() function to 'ignore' query escaping