Fix routingKey logic