Added filtering by ID