Use consistent query
name in uplink metrics
#5816
Merged
query
name in uplink metrics
#5816