Secondary Index (cql) fixes