[#64037166] change order of joins
[#64037166] order by geo entity to make it easier on the eyes