Changed because ccl_rpn_query sets attribute set.