Whoops, make sure we correctly hold on to the metadata for non geographical entities