Bug fixes in ItemsMetadata

Change-Id: I436bde2923fcce11e893e694459575a6ed9bf1ec