Imrovements and fixes for Item Properties