Added better support to ETA, Label, and title display