click comma and quote logic fixed