Allow filter by ID (Fix #327)