Correct list behavior, also fixes bundle recognition issues.