patch for resolving the correct registry tag with multiple hosts