add more unsafe metadata
handle lookups not working, fixes #179