Visualise rabbimq queue name on service map

Using otel java agent to instrument spring boot microservices and I see that in the service map rabbitmq is seen as a single consumer/producer regardless of the exchange or queue being used. Is there a way to have individual queues shown on the service map? I have also noticed that some traces appear to be not 100% accurate. For example, service A send a message to a queue and service B consumes the message. I see lines on the service map from service A directly to service B.