#2050: Improve displayed id parsing