Updated comma and parenthesis click functionality