Tweaking hasKeyItem checks