avoid hitting not owning customer via uri
change handling of changed uri