Food name display fix

Fixes #7745. Solid foods that are generated in containers now show up as plural, if they have charges. For example, "cardboard box of cookie (4)" will now read "cardboard box of cookies (4)".