adding single-quote support