Add CDL auto-query

If CDL is not part of query, adds a default in on the server side