Fixed issues with items that are not found