Fixed corp/ship/locations not being pulled proplery - finaly hopefuly