* replace query with enumerator * remove unnecessary imports * prevent from toggling APC during event * all entity query i guess