Add handling for parenthese in field name