MODE-1444: Fixes for CQL commands