fixup! adapted queries for crate