add cassandra query
fixed merge issues