improve cl_query performance