fix combining query with empty extended query
Merge branch 'hotfix/fix_cql_combine_with_null'