Encode filters with embeded CQL markers

Switch to using ${} around filters when encoding.  Escape and respect escaping of filters when using this notation.