Fixed few items parsing