Fix dropped item display even more
Fix name display of contained items

(with respect to grammatical number)