move make-queryable to core namespace