Fix bugs and properties of POI