added new entity query, fixed enum wrapper eqaulity bug and fixed performance metric bug