Fixed issue with ampersand in cql_filter