all_query now counts CREs