Adjusts the tracking of entries (again)

This commit adjusts the tracking of entries so that they are associated
with both a drawing and a tier. It's possible they will be adjusted
again to only be associated with a tier (as a tier is already associated
with a drawing).