Added eager loading of geo entities