Fixed 2 bugs with entity location and metadata. Released 2,2