Updated ccl_pquery to consider local attribute set too.