Fixed previous error

My previous change was not working when the displayed item had a specified label. This changes should fix that. 
Sorry for breaking your stuff :)