Fix feature check guarding index selection