Fix "formatted" field for general dictionary terms

Per #269, fix the "formatted" field to pull data from the proper
location, and also store it within the same numbered object, rather
than outside of it.