More checks when expanding items