fixes vhost ordering and federation upstream errors