Changed to check more exactly item form type