Resolves #83. Tested on support tickets 74108, 74273, 6787.

My local copy fo the database is old, so 74235 isn't exciting.