Updated code for || and tabindex