should be filtering by id as well