Adding handling of entity locations for shipto's
Removing carp always