Expanded the filtering for get by ID.