Try to match on callsign if serviceid is missing
Tidy up output