Fixed import
Added check for item link property