Fix small bugs with cql quating and unicode encoding

Closes-Bug: 1360330
Closes-Bug: 1360327

Change-Id: I23bbf0e03db801c75c426c5291550da2a0e78ae1