Don't map twice if we don't need to.
Simplify code by just reusing the world query.
Change Int to Long on the World class.