Mat 7223/update logic for checking existing cql meta data

Mat 7223/update logic for checking existing cql meta data #298