Improve quote char detection