1 files changed, 5 insertions, 10 deletions
diff --git a/ecs/src/query/flexible.rs b/ecs/src/query/flexible.rs
index 5c23e68..129ee66 100644
--- a/ecs/src/query/flexible.rs
+++ b/ecs/src/query/flexible.rs
@@ -1,13 +1,8 @@
 //! Low-level querying.
 use std::iter::{repeat_n, Filter, Flatten, Map, RepeatN, Zip};
 
-use crate::component::storage::{
-    Archetype,
-    ArchetypeEntity,
-    ArchetypeRefIter,
-    EntityIter,
-    Storage as ComponentStorage,
-};
+use crate::component::storage::archetype::{Archetype, ArchetypeEntity, EntityIter};
+use crate::component::storage::{ArchetypeRefIter, Storage as ComponentStorage};
 use crate::component::{
     Metadata as ComponentMetadata,
     RefSequence as ComponentRefSequence,
@@ -48,7 +43,7 @@ where
                     }) as ComponentIterMapFn,
                 )
                 .flatten()
-                .filter(|(_, entity)| OptionsT::entity_filter(entity.components())),
+                .filter(|(_, entity)| OptionsT::entity_filter(&entity.components)),
         }
     }
 
@@ -117,13 +112,13 @@ impl<'query> EntityHandle<'query>
     #[inline]
     pub fn uid(&self) -> Uid
     {
-        self.entity.uid()
+        self.entity.uid
     }
 
     #[inline]
     pub fn components(&self) -> &'query [EntityComponent]
     {
-        self.entity.components()
+        &self.entity.components
     }
 
     #[inline]